diff --git a/etemplate/js/et2_extension_nextmatch_rowProvider.js b/etemplate/js/et2_extension_nextmatch_rowProvider.js
index 4938955824..8539fc0d60 100644
--- a/etemplate/js/et2_extension_nextmatch_rowProvider.js
+++ b/etemplate/js/et2_extension_nextmatch_rowProvider.js
@@ -527,7 +527,22 @@ var et2_nextmatch_rowProvider = ClassWithAttributes.extend(
 					if(!categories) categories = _mgrs["sel_options"].getEntry("${row}["+category_location + "]");
 
 					// Cache
-					if(categories) this.categories = categories;
+					if(categories)
+					{
+						if (!jQuery.isArray(categories))
+						{
+							this.categories = categories;
+						}
+						else
+						{
+							this.categories = {};
+							for(var i=0; i < categories.length; ++i)
+							{
+								var cat = categories[i];
+								this.categories[cat.value] = cat;
+							}
+						}
+					}
 				}
 				for(var i = 0; i < cats.length && this.categories; i++)
 				{