diff --git a/server/AyaNova/kpi/WorkOrderItemLaborQuantitySummary.cs b/server/AyaNova/kpi/WorkOrderItemLaborQuantitySummary.cs
index 793f66e1..a1981e3c 100644
--- a/server/AyaNova/kpi/WorkOrderItemLaborQuantitySummary.cs
+++ b/server/AyaNova/kpi/WorkOrderItemLaborQuantitySummary.cs
@@ -35,22 +35,13 @@ namespace AyaNova.KPI
 
             var timeSpan = (string)options.Criteria["timeSpan"];
             var interval = (string)options.Criteria["interval"];
-            var wotags = options.Criteria["wotags"].ToObject<List<string>>();
-            var woitemtags = options.Criteria["woitemtags"].ToObject<List<string>>();
-
             var dateWhere = DataListSqlFilterCriteriaBuilder.DataFilterToColumnCriteria("aworkorderitemlabor.servicestopdate", UiFieldDataType.DateTime, "no-operator", timeSpan, options.ClientTimeStamp);
-
-            //optional tags
-            string woTagsWhere = null;
-            if (wotags.Count > 0)
-                woTagsWhere = " AND " + DataListSqlFilterCriteriaBuilder.TagDataFilterToColumnCriteria("aworkorder.tags", DataListFilterComparisonOperator.Contains, string.Join(",", wotags));
-
-
-            string woItemTagsWhere = null;
-            if (woitemtags.Count > 0)
-                woItemTagsWhere = " AND " + DataListSqlFilterCriteriaBuilder.TagDataFilterToColumnCriteria("aworkorderitem.tags", DataListFilterComparisonOperator.Contains, string.Join(",", woitemtags));
-
-
+            var wotags = options.Criteria["wotags"].ToObject<List<string>>();
+            bool wotagsany = options.Criteria["wotagsany"].ToObject<bool>();
+            var woitemtags = options.Criteria["woitemtags"].ToObject<List<string>>();
+            bool woitemtagsany = options.Criteria["woitemtagsany"].ToObject<bool>();
+            string woTagsWhere = DataListSqlFilterCriteriaBuilder.KPITagFilterToSqlCriteria("aworkorder.tags", wotags, wotagsany);
+            string woItemTagsWhere = DataListSqlFilterCriteriaBuilder.KPITagFilterToSqlCriteria("aworkorderitem.tags", woitemtags, woitemtagsany); ;
 
             _dataQuery = @$"SELECT row_to_json(t) as res from (	
                             select SUM(AWORKORDERITEMLABOR.serviceratequantity) y, date_trunc('{interval}',AWORKORDERITEMLABOR.servicestopdate) x
diff --git a/server/AyaNova/kpi/WorkOrderOverdueAllList.cs b/server/AyaNova/kpi/WorkOrderOverdueAllList.cs
index b8defcfb..3f847776 100644
--- a/server/AyaNova/kpi/WorkOrderOverdueAllList.cs
+++ b/server/AyaNova/kpi/WorkOrderOverdueAllList.cs
@@ -30,15 +30,9 @@ namespace AyaNova.KPI
             bool wotagsany = options.Criteria["wotagsany"].ToObject<bool>();
             var woitemtags = options.Criteria["woitemtags"].ToObject<List<string>>();
             bool woitemtagsany = options.Criteria["woitemtagsany"].ToObject<bool>();
-
-            string woTagsWhere = DataListSqlFilterCriteriaBuilder.KPITagFilterToSqlCriteria("aworkorder.tags", wotags, wotagsany);
-            // if (wotags.Count > 0)
-            //     woTagsWhere = " AND " + DataListSqlFilterCriteriaBuilder.TagDataFilterToColumnCriteria("aworkorder.tags", DataListFilterComparisonOperator.Contains, string.Join(",", wotags));
-
+            string woTagsWhere = DataListSqlFilterCriteriaBuilder.KPITagFilterToSqlCriteria("aworkorder.tags", wotags, wotagsany);          
             string woItemTagsWhere = DataListSqlFilterCriteriaBuilder.KPITagFilterToSqlCriteria("aworkorderitem.tags", woitemtags, woitemtagsany); ;
-            // if (woitemtags.Count > 0)
-            //     woItemTagsWhere = " AND " + DataListSqlFilterCriteriaBuilder.TagDataFilterToColumnCriteria("aworkorderitem.tags", DataListFilterComparisonOperator.Contains, string.Join(",", woitemtags));
-
+           
             _dataQuery = @$"SELECT row_to_json(t) as res from (	
                                 SELECT distinct(AWORKORDER.ID),
                                 AWORKORDER.SERIAL,