diff --git a/src/matrix/dataset_util.js b/src/matrix/dataset_util.js
index f420ae0b0d2e09ad5f9da2dfecaf9f787e959729..6c15c1a6506f76ad5a08b67ec21229b78cb38316 100644
--- a/src/matrix/dataset_util.js
+++ b/src/matrix/dataset_util.js
@@ -635,16 +635,18 @@ morpheus.DatasetUtil.autocompleteValues = function(dataset) {
 			});
 
 		});
-		fields.forEach(function(field) {
-			if (regex.test(field)) {
-				matches.push({
-					value : field + ':',
-					label : '<span style="font-weight:300;">' + field
-							+ ':</span>',
-					show : true
-				});
-			}
-		});
+		if (field == null) {
+			fields.forEach(function(field) {
+				if (regex.test(field)) {
+					matches.push({
+						value : field + ':',
+						label : '<span style="font-weight:300;">' + field
+								+ ':</span>',
+						show : true
+					});
+				}
+			});
+		}
 		cb(matches);
 	};