diff --git a/DataFilter/DataFilterFilteringLists.cs b/DataFilter/DataFilterFilteringLists.cs
index 0fc9733..864e9f1 100644
--- a/DataFilter/DataFilterFilteringLists.cs
+++ b/DataFilter/DataFilterFilteringLists.cs
@@ -4352,7 +4352,7 @@ same as the server does but in a central location here for all tests to use.
 
             //active bool test filter
             dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "notes";
+            DataFilterActive.fld = "widgetnotes";
             DataFilterActive.op = Util.OpEquality;
             DataFilterActive.value = "aardvark";
             dfilter.Add(DataFilterActive);
@@ -4478,7 +4478,7 @@ same as the server does but in a central location here for all tests to use.
 
             //active bool test filter
             dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "notes";
+            DataFilterActive.fld = "widgetnotes";
             DataFilterActive.op = Util.OpEquality;
             DataFilterActive.value = "O'Flaherty's pub";
             dfilter.Add(DataFilterActive);
@@ -4601,7 +4601,7 @@ same as the server does but in a central location here for all tests to use.
 
             //active bool test filter
             dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "notes";
+            DataFilterActive.fld = "widgetnotes";
             DataFilterActive.op = Util.OpEquality;
             DataFilterActive.value = "Bill & Ted's excellent adventure";
             dfilter.Add(DataFilterActive);
@@ -4734,7 +4734,7 @@ same as the server does but in a central location here for all tests to use.
 
             //active bool test filter
             dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "notes";
+            DataFilterActive.fld = "widgetnotes";
             DataFilterActive.op = Util.OpEquality;
             DataFilterActive.value = InclusiveTestString;
             dfilter.Add(DataFilterActive);
@@ -4858,7 +4858,7 @@ same as the server does but in a central location here for all tests to use.
 
             //active bool test filter
             dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "notes";
+            DataFilterActive.fld = "widgetnotes";
             DataFilterActive.op = Util.OpGreaterThan;
             DataFilterActive.value = "Aardvark";
             dfilter.Add(DataFilterActive);
@@ -4982,7 +4982,7 @@ same as the server does but in a central location here for all tests to use.
 
             //active bool test filter
             dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "notes";
+            DataFilterActive.fld = "widgetnotes";
             DataFilterActive.op = Util.OpGreaterThanOrEqualTo;
             DataFilterActive.value = "Bjarn";
             dfilter.Add(DataFilterActive);
@@ -5106,7 +5106,7 @@ same as the server does but in a central location here for all tests to use.
 
             //active bool test filter
             dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "notes";
+            DataFilterActive.fld = "widgetnotes";
             DataFilterActive.op = Util.OpLessThan;
             DataFilterActive.value = "Celery";
             dfilter.Add(DataFilterActive);
@@ -5230,7 +5230,7 @@ same as the server does but in a central location here for all tests to use.
 
             //active bool test filter
             dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "notes";
+            DataFilterActive.fld = "widgetnotes";
             DataFilterActive.op = Util.OpLessThanOrEqualTo;
             DataFilterActive.value = "Dusseldorf";
             dfilter.Add(DataFilterActive);
@@ -5353,7 +5353,7 @@ same as the server does but in a central location here for all tests to use.
 
             //active bool test filter
             dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "notes";
+            DataFilterActive.fld = "widgetnotes";
             DataFilterActive.op = Util.OpNotEqual;
             DataFilterActive.value = "Elephant";
             dfilter.Add(DataFilterActive);
@@ -5476,7 +5476,7 @@ same as the server does but in a central location here for all tests to use.
 
             //active bool test filter
             dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "notes";
+            DataFilterActive.fld = "widgetnotes";
             DataFilterActive.op = Util.OpNotContains;
             DataFilterActive.value = "short";
             dfilter.Add(DataFilterActive);
@@ -5599,7 +5599,7 @@ same as the server does but in a central location here for all tests to use.
 
             //active bool test filter
             dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "notes";
+            DataFilterActive.fld = "widgetnotes";
             DataFilterActive.op = Util.OpContains;
             DataFilterActive.value = "red";
             dfilter.Add(DataFilterActive);
@@ -5722,7 +5722,7 @@ same as the server does but in a central location here for all tests to use.
 
             //active bool test filter
             dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "notes";
+            DataFilterActive.fld = "widgetnotes";
             DataFilterActive.op = Util.OpStartsWith;
             DataFilterActive.value = "Gra";
             dfilter.Add(DataFilterActive);
@@ -5846,7 +5846,7 @@ same as the server does but in a central location here for all tests to use.
 
             //active bool test filter
             dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "notes";
+            DataFilterActive.fld = "widgetnotes";
             DataFilterActive.op = Util.OpEndsWith;
             DataFilterActive.value = "vat";
             dfilter.Add(DataFilterActive);
@@ -5969,7 +5969,7 @@ same as the server does but in a central location here for all tests to use.
             //inclusive test filter
 
             dynamic FilterItem = new JObject();
-            FilterItem.fld = "count";
+            FilterItem.fld = "widgetcount";
             FilterItem.op = Util.OpEquality;
             FilterItem.value = 5;
             dfilter.Add(FilterItem);
@@ -6072,7 +6072,7 @@ same as the server does but in a central location here for all tests to use.
             //inclusive test filter
 
             dynamic FilterItem = new JObject();
-            FilterItem.fld = "count";
+            FilterItem.fld = "widgetcount";
             FilterItem.op = Util.OpGreaterThan;
             FilterItem.value = 54;
             dfilter.Add(FilterItem);
@@ -6175,7 +6175,7 @@ same as the server does but in a central location here for all tests to use.
             //inclusive test filter
 
             dynamic FilterItem = new JObject();
-            FilterItem.fld = "count";
+            FilterItem.fld = "widgetcount";
             FilterItem.op = Util.OpGreaterThanOrEqualTo;
             FilterItem.value = 555;
             dfilter.Add(FilterItem);
@@ -6280,7 +6280,7 @@ same as the server does but in a central location here for all tests to use.
             //inclusive test filter
 
             dynamic FilterItem = new JObject();
-            FilterItem.fld = "count";
+            FilterItem.fld = "widgetcount";
             FilterItem.op = Util.OpLessThan;
             FilterItem.value = 5555;
             dfilter.Add(FilterItem);
@@ -6384,7 +6384,7 @@ same as the server does but in a central location here for all tests to use.
             //inclusive test filter
 
             dynamic FilterItem = new JObject();
-            FilterItem.fld = "count";
+            FilterItem.fld = "widgetcount";
             FilterItem.op = Util.OpLessThanOrEqualTo;
             FilterItem.value = -444;
             dfilter.Add(FilterItem);
@@ -6489,7 +6489,7 @@ same as the server does but in a central location here for all tests to use.
             //inclusive test filter
 
             dynamic FilterItem = new JObject();
-            FilterItem.fld = "count";
+            FilterItem.fld = "widgetcount";
             FilterItem.op = Util.OpNotEqual;
             FilterItem.value = 223;
             dfilter.Add(FilterItem);
@@ -7698,7 +7698,7 @@ same as the server does but in a central location here for all tests to use.
 
             //active test filter            
             dynamic DataFilterActive = new JObject();
-            DataFilterActive.fld = "tags";
+            DataFilterActive.fld = "widgettags";
             DataFilterActive.op = Util.OpEquality;
             dynamic FilterTagsArray = new JArray();
             FilterTagsArray.Add("red-tag-test");