diff --git a/DataList/DataListFiltering.cs b/DataList/DataListFiltering.cs
index 1c5f5e6..b42a6ea 100644
--- a/DataList/DataListFiltering.cs
+++ b/DataList/DataListFiltering.cs
@@ -1113,11 +1113,11 @@ same as the server does but in a central location here for all tests to use.
             dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
 
             //FILTER
-            dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "widgetnotes";
-            DataFilterActive.op = Util.OpEquality;
-            DataFilterActive.value = "Bill & Ted's excellent adventure";
-            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX));
+            // dynamic DataFilterActive = new JObject();
+            // DataFilterActive.fld = "widgetnotes";
+            // DataFilterActive.op = Util.OpEquality;
+            // DataFilterActive.value = "Bill & Ted's excellent adventure";
+            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetnotes", Util.OpEquality, "Bill & Ted's excellent adventure"));
             //FETCH DATALIST
             a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView));
             Util.ValidateDataReturnResponseOk(a);
@@ -1218,11 +1218,11 @@ same as the server does but in a central location here for all tests to use.
             dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
 
             //FILTER
-            dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "widgetnotes";
-            DataFilterActive.op = Util.OpEquality;
-            DataFilterActive.value = InclusiveTestString;
-            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX));
+            // dynamic DataFilterActive = new JObject();
+            // DataFilterActive.fld = "widgetnotes";
+            // DataFilterActive.op = Util.OpEquality;
+            // DataFilterActive.value = InclusiveTestString;
+            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetnotes", Util.OpEquality, InclusiveTestString));
 
             //FETCH DATALIST
             a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView));
@@ -1321,11 +1321,11 @@ same as the server does but in a central location here for all tests to use.
             dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
 
             //FILTER
-            dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "widgetnotes";
-            DataFilterActive.op = Util.OpGreaterThan;
-            DataFilterActive.value = "Aardvark";
-            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX));
+            // dynamic DataFilterActive = new JObject();
+            // DataFilterActive.fld = "widgetnotes";
+            // DataFilterActive.op = Util.OpGreaterThan;
+            // DataFilterActive.value = "Aardvark";
+            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetnotes", Util.OpGreaterThan, "Aardvark"));
 
 
             //FETCH DATALIST
@@ -1425,11 +1425,11 @@ same as the server does but in a central location here for all tests to use.
             dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
 
             //FILTER
-            dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "widgetnotes";
-            DataFilterActive.op = Util.OpGreaterThanOrEqualTo;
-            DataFilterActive.value = "Bjarn";
-            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX));
+            // dynamic DataFilterActive = new JObject();
+            // DataFilterActive.fld = "widgetnotes";
+            // DataFilterActive.op = Util.OpGreaterThanOrEqualTo;
+            // DataFilterActive.value = "Bjarn";
+            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetnotes", Util.OpGreaterThanOrEqualTo, "Bjarn"));
 
             //FETCH DATALIST
             a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView));
@@ -1528,11 +1528,11 @@ same as the server does but in a central location here for all tests to use.
             dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
 
             //FILTER
-            dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "widgetnotes";
-            DataFilterActive.op = Util.OpLessThan;
-            DataFilterActive.value = "Celery";
-            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX));
+            // dynamic DataFilterActive = new JObject();
+            // DataFilterActive.fld = "widgetnotes";
+            // DataFilterActive.op = Util.OpLessThan;
+            // DataFilterActive.value = "Celery";
+            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetnotes", Util.OpLessThan, "Celery"));
 
             //FETCH DATALIST
             a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView));
@@ -1631,11 +1631,11 @@ same as the server does but in a central location here for all tests to use.
             dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
 
             //FILTER
-            dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "widgetnotes";
-            DataFilterActive.op = Util.OpLessThanOrEqualTo;
-            DataFilterActive.value = "Dusseldorf";
-            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX));
+            // dynamic DataFilterActive = new JObject();
+            // DataFilterActive.fld = "widgetnotes";
+            // DataFilterActive.op = Util.OpLessThanOrEqualTo;
+            // DataFilterActive.value = "Dusseldorf";
+            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetnotes", Util.OpLessThanOrEqualTo, "Dusseldorf"));
 
 
             //FETCH DATALIST
@@ -1734,11 +1734,11 @@ same as the server does but in a central location here for all tests to use.
             dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
 
             //FILTER
-            dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "widgetnotes";
-            DataFilterActive.op = Util.OpNotEqual;
-            DataFilterActive.value = "Elephant";
-            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX));
+            // dynamic DataFilterActive = new JObject();
+            // DataFilterActive.fld = "widgetnotes";
+            // DataFilterActive.op = Util.OpNotEqual;
+            // DataFilterActive.value = "Elephant";
+            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetnotes", Util.OpNotEqual, "Elephant"));
 
             //FETCH DATALIST
             a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView));
@@ -1836,11 +1836,11 @@ same as the server does but in a central location here for all tests to use.
             dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
 
             //FILTER
-            dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "widgetnotes";
-            DataFilterActive.op = Util.OpNotContains;
-            DataFilterActive.value = "short";
-            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX));
+            // dynamic DataFilterActive = new JObject();
+            // DataFilterActive.fld = "widgetnotes";
+            // DataFilterActive.op = Util.OpNotContains;
+            // DataFilterActive.value = "short";
+            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetnotes", Util.OpNotContains, "short"));
 
             //FETCH DATALIST
             a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView));
@@ -1938,11 +1938,11 @@ same as the server does but in a central location here for all tests to use.
             dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
 
             //FILTER
-            dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "widgetnotes";
-            DataFilterActive.op = Util.OpContains;
-            DataFilterActive.value = "red";
-            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX));
+            // dynamic DataFilterActive = new JObject();
+            // DataFilterActive.fld = "widgetnotes";
+            // DataFilterActive.op = Util.OpContains;
+            // DataFilterActive.value = "red";
+            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetnotes", Util.OpContains, "red"));
             //FETCH DATALIST
             a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView));
             Util.ValidateDataReturnResponseOk(a);
@@ -2039,11 +2039,11 @@ same as the server does but in a central location here for all tests to use.
             dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
 
             //FILTER
-            dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "widgetnotes";
-            DataFilterActive.op = Util.OpStartsWith;
-            DataFilterActive.value = "Gra";
-            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX));
+            // dynamic DataFilterActive = new JObject();
+            // DataFilterActive.fld = "widgetnotes";
+            // DataFilterActive.op = Util.OpStartsWith;
+            // DataFilterActive.value = "Gra";
+            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetnotes", Util.OpStartsWith, "Gra"));
 
 
             //FETCH DATALIST
@@ -2143,11 +2143,11 @@ same as the server does but in a central location here for all tests to use.
             dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
 
             //FILTER
-            dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "widgetnotes";
-            DataFilterActive.op = Util.OpEndsWith;
-            DataFilterActive.value = "vat";
-            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("XXXX", Util.XXXX, XXXX));
+            // dynamic DataFilterActive = new JObject();
+            // DataFilterActive.fld = "widgetnotes";
+            // DataFilterActive.op = Util.OpEndsWith;
+            // DataFilterActive.value = "vat";
+            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetnotes", Util.OpEndsWith, "vat"));
 
 
 
@@ -2190,14 +2190,13 @@ same as the server does but in a central location here for all tests to use.
         }
 
 
-
-
-
-
         //======================
 
         #endregion string filter tests
 
+
+
+
         ///////////////////////////////////////////////////////////////////////////////
         //INT
         //