diff --git a/DataFilter/DataFilterFilteringLists.cs b/DataFilter/DataFilterFilteringLists.cs
index b7e9320..0fc9733 100644
--- a/DataFilter/DataFilterFilteringLists.cs
+++ b/DataFilter/DataFilterFilteringLists.cs
@@ -276,7 +276,7 @@ same as the server does but in a central location here for all tests to use.
             //     if (ExcludedWidgetId == o["id"].Value<long>())//whups
             //         ExclusiveMatchCount++;
             // }
-             foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
 
@@ -387,7 +387,7 @@ same as the server does but in a central location here for all tests to use.
             //     if (ExcludedWidgetId == o["id"].Value<long>())//whups
             //         ExclusiveMatchCount++;
             // }
-             foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
 
@@ -490,7 +490,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-           foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
 
@@ -698,7 +698,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-           foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
 
@@ -802,7 +802,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-           foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
                 if (IncludedWidgetId == o["v"].Value<long>())
@@ -1321,7 +1321,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-           foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
                 if (IncludedWidgetId == o["v"].Value<long>())
@@ -1534,7 +1534,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-           foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
                 if (IncludedWidgetId == o["v"].Value<long>())
@@ -1749,7 +1749,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-          foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
 
@@ -1857,7 +1857,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-           foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
                 if (IncludedWidgetId == o["v"].Value<long>())
@@ -1961,7 +1961,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-             foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
 
@@ -2734,7 +2734,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-           foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
                 if (IncludedWidgetId == o["v"].Value<long>())
@@ -2850,7 +2850,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-           foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
                 if (IncludedWidgetId == o["v"].Value<long>())
@@ -2967,7 +2967,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-           foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
                 if (IncludedWidgetId == o["v"].Value<long>())
@@ -3287,7 +3287,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-             foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
 
@@ -3394,7 +3394,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-         foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
 
@@ -3607,7 +3607,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-             foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
 
@@ -3925,7 +3925,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-           foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
                 if (IncludedWidgetId == o["v"].Value<long>())
@@ -4030,7 +4030,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-           foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
                 if (IncludedWidgetId == o["v"].Value<long>())
@@ -4136,7 +4136,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-           foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
                 if (IncludedWidgetId == o["v"].Value<long>())
@@ -4375,11 +4375,12 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-            foreach (JObject o in v)
+           foreach (JArray ja in v)
             {
-                if (InclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                JObject o = ja[0] as JObject;
+                if (InclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     InclusiveMatchCount++;
-                if (ExclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                if (ExclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     ExclusiveMatchCount++;
             }
 
@@ -4500,11 +4501,12 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-            foreach (JObject o in v)
+            foreach (JArray ja in v)
             {
-                if (InclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                JObject o = ja[0] as JObject;
+                if (InclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     InclusiveMatchCount++;
-                if (ExclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                if (ExclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     ExclusiveMatchCount++;
             }
 
@@ -4630,7 +4632,7 @@ same as the server does but in a central location here for all tests to use.
             //         ExclusiveMatchCount++;
             // }
 
-              foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
 
@@ -4755,11 +4757,12 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-            foreach (JObject o in v)
+            foreach (JArray ja in v)
             {
-                if (InclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                JObject o = ja[0] as JObject;
+                if (InclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     InclusiveMatchCount++;
-                if (ExclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                if (ExclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     ExclusiveMatchCount++;
             }
 
@@ -4878,11 +4881,12 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-            foreach (JObject o in v)
+            foreach (JArray ja in v)
             {
-                if (InclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                JObject o = ja[0] as JObject;
+                if (InclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     InclusiveMatchCount++;
-                if (ExclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                if (ExclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     ExclusiveMatchCount++;
             }
 
@@ -5001,11 +5005,12 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-            foreach (JObject o in v)
+           foreach (JArray ja in v)
             {
-                if (InclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                JObject o = ja[0] as JObject;
+                if (InclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     InclusiveMatchCount++;
-                if (ExclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                if (ExclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     ExclusiveMatchCount++;
             }
 
@@ -5124,11 +5129,12 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-            foreach (JObject o in v)
+            foreach (JArray ja in v)
             {
-                if (InclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                JObject o = ja[0] as JObject;
+                if (InclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     InclusiveMatchCount++;
-                if (ExclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                if (ExclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     ExclusiveMatchCount++;
             }
 
@@ -5247,11 +5253,12 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-            foreach (JObject o in v)
+            foreach (JArray ja in v)
             {
-                if (InclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                JObject o = ja[0] as JObject;
+                if (InclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     InclusiveMatchCount++;
-                if (ExclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                if (ExclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     ExclusiveMatchCount++;
             }
 
@@ -5369,11 +5376,12 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-            foreach (JObject o in v)
+            foreach (JArray ja in v)
             {
-                if (InclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                JObject o = ja[0] as JObject;
+                if (InclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     InclusiveMatchCount++;
-                if (ExclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                if (ExclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     ExclusiveMatchCount++;
             }
 
@@ -5491,11 +5499,12 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-            foreach (JObject o in v)
+            foreach (JArray ja in v)
             {
-                if (InclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                JObject o = ja[0] as JObject;
+                if (InclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     InclusiveMatchCount++;
-                if (ExclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                if (ExclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     ExclusiveMatchCount++;
             }
 
@@ -5613,11 +5622,12 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-            foreach (JObject o in v)
+           foreach (JArray ja in v)
             {
-                if (InclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                JObject o = ja[0] as JObject;
+                if (InclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     InclusiveMatchCount++;
-                if (ExclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                if (ExclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     ExclusiveMatchCount++;
             }
 
@@ -5735,11 +5745,12 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-            foreach (JObject o in v)
+           foreach (JArray ja in v)
             {
-                if (InclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                JObject o = ja[0] as JObject;
+                if (InclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     InclusiveMatchCount++;
-                if (ExclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                if (ExclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     ExclusiveMatchCount++;
             }
 
@@ -5858,11 +5869,12 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-            foreach (JObject o in v)
+           foreach (JArray ja in v)
             {
-                if (InclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                JObject o = ja[0] as JObject;
+                if (InclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     InclusiveMatchCount++;
-                if (ExclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                if (ExclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     ExclusiveMatchCount++;
             }
 
@@ -6186,7 +6198,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-           foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
                 if (IncludedWidgetId == o["v"].Value<long>())
@@ -6889,7 +6901,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-           foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
                 if (IncludedWidgetId == o["v"].Value<long>())
@@ -7095,7 +7107,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-           foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
                 if (IncludedWidgetId == o["v"].Value<long>())
@@ -7200,7 +7212,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-           foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
                 if (IncludedWidgetId == o["v"].Value<long>())
@@ -7304,7 +7316,7 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-           foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
                 if (IncludedWidgetId == o["v"].Value<long>())
@@ -7557,8 +7569,8 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-            
-            
+
+
             // foreach (JObject o in v)
             // {
             //     if (InclusiveWidgetIdList.Contains(o["id"].Value<long>()))
@@ -7567,7 +7579,7 @@ same as the server does but in a central location here for all tests to use.
             //         ExclusiveMatchCount++;
             // }
 
-             foreach (JArray ja in v)
+            foreach (JArray ja in v)
             {
                 JObject o = ja[0] as JObject;
 
@@ -7577,7 +7589,7 @@ same as the server does but in a central location here for all tests to use.
                     ExclusiveMatchCount++;
             }
 
-           
+
 
             InclusiveMatchCount.Should().Be(InclusiveWidgetIdList.Count);
             ExclusiveMatchCount.Should().Be(0);
@@ -7712,11 +7724,12 @@ same as the server does but in a central location here for all tests to use.
             List<long> IDInResultList = new List<long>();
             int InclusiveMatchCount = 0;
             int ExclusiveMatchCount = 0;
-            foreach (JObject o in v)
+            foreach (JArray ja in v)
             {
-                if (InclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                JObject o = ja[0] as JObject;
+                if (InclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     InclusiveMatchCount++;
-                if (ExclusiveWidgetIdList.Contains(o["id"].Value<long>()))
+                if (ExclusiveWidgetIdList.Contains(o["v"].Value<long>()))
                     ExclusiveMatchCount++;
             }