server/AyaNova/PickList/PickListSqlBuilder.cs

@@ -73,10 +73,11 @@ namespace AyaNova.PickList
 
             //PROCESS TAG SPECIFIC QUERY
             //
-            if(HasTagSpecificQuery){               
+            if (HasTagSpecificQuery)
+            {
                 //get the tag column
-                 AyaPickListFieldDefinition tagColumn = pickList.ColumnDefinitions.FirstOrDefault(x => x.ColumnDataType == UiFieldDataType.Tags);
+                AyaPickListFieldDefinition tagColumn = pickList.ColumnDefinitions.FirstOrDefault(x => x.ColumnDataType == UiFieldDataType.Tags);
-              TagSpecificWhereFragment=$"(array_to_string({tagColumn.GetSqlValueColumnName()},',') like '%{tagSpecificQuery}%')";
+                TagSpecificWhereFragment = $"(array_to_string({tagColumn.GetSqlValueColumnName()},',') like '%{tagSpecificQuery}%')";
             }
 
 
@@ -183,6 +184,13 @@ namespace AyaNova.PickList
 
             //WHERE           
             sb.Append(" where ");
+
+            if (HasTagSpecificQuery)
+            {
+                sb.Append(TagSpecificWhereFragment);
+                sb.Append(" and (");
+            }
+
             if (!IncludeInactive)
             {
                 sb.Append(ActiveWhereFragment);
@@ -197,6 +205,12 @@ namespace AyaNova.PickList
             //clear trailing or
             sb.Length -= 4;
             //enclosing parenthesis
+
+            if (HasTagSpecificQuery)
+            {
+                sb.Append(")");
+            }
+
             if (!IncludeInactive)
             {
                 sb.Append(")");