diff --git a/server/AyaNova/PickList/PickListSqlBuilder.cs b/server/AyaNova/PickList/PickListSqlBuilder.cs
index 68ed8c9c..c102b87f 100644
--- a/server/AyaNova/PickList/PickListSqlBuilder.cs
+++ b/server/AyaNova/PickList/PickListSqlBuilder.cs
@@ -156,7 +156,7 @@ namespace AyaNova.PickList
                     }
 
 
-                    if (HasAutoCompleteQuery && !HasTagSpecificQuery)
+                    if (HasAutoCompleteQuery && !string.IsNullOrWhiteSpace(sWhere))//swhere can be empty on a tag in a tag specific query
                         lWhere.Add(sWhere);