diff --git a/CareTogether.Report/definition/bookmarks/Bookmark2245b7caee2e5edb8d04.bookmark.json b/CareTogether.Report/definition/bookmarks/Bookmark2245b7caee2e5edb8d04.bookmark.json
index 5a58fbb..aaafa3c 100644
--- a/CareTogether.Report/definition/bookmarks/Bookmark2245b7caee2e5edb8d04.bookmark.json
+++ b/CareTogether.Report/definition/bookmarks/Bookmark2245b7caee2e5edb8d04.bookmark.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/bookmark/1.2.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/bookmark/1.4.0/schema.json",
   "displayName": "All Approved Adults",
   "name": "Bookmark2245b7caee2e5edb8d04",
   "options": {
diff --git a/CareTogether.Report/definition/pages/03622d788c359b5e7432/page.json b/CareTogether.Report/definition/pages/03622d788c359b5e7432/page.json
index 77e9c97..4941e9e 100644
--- a/CareTogether.Report/definition/pages/03622d788c359b5e7432/page.json
+++ b/CareTogether.Report/definition/pages/03622d788c359b5e7432/page.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/1.4.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.0.0/schema.json",
   "name": "03622d788c359b5e7432",
   "displayName": "Approvals History",
   "displayOption": "FitToPage",
diff --git a/CareTogether.Report/definition/pages/03622d788c359b5e7432/visuals/182d15740e12f9e58d94/visual.json b/CareTogether.Report/definition/pages/03622d788c359b5e7432/visuals/182d15740e12f9e58d94/visual.json
index 91dc177..f28034d 100644
--- a/CareTogether.Report/definition/pages/03622d788c359b5e7432/visuals/182d15740e12f9e58d94/visual.json
+++ b/CareTogether.Report/definition/pages/03622d788c359b5e7432/visuals/182d15740e12f9e58d94/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "182d15740e12f9e58d94",
   "position": {
     "x": 0,
diff --git a/CareTogether.Report/definition/pages/03622d788c359b5e7432/visuals/d6084660d102c3617329/visual.json b/CareTogether.Report/definition/pages/03622d788c359b5e7432/visuals/d6084660d102c3617329/visual.json
index 9ea410b..6665e54 100644
--- a/CareTogether.Report/definition/pages/03622d788c359b5e7432/visuals/d6084660d102c3617329/visual.json
+++ b/CareTogether.Report/definition/pages/03622d788c359b5e7432/visuals/d6084660d102c3617329/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "d6084660d102c3617329",
   "position": {
     "x": 10.443686006825939,
diff --git a/CareTogether.Report/definition/pages/101a4b085e432a0c869a/page.json b/CareTogether.Report/definition/pages/101a4b085e432a0c869a/page.json
index 493ee3c..df323d0 100644
--- a/CareTogether.Report/definition/pages/101a4b085e432a0c869a/page.json
+++ b/CareTogether.Report/definition/pages/101a4b085e432a0c869a/page.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/1.4.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.0.0/schema.json",
   "name": "101a4b085e432a0c869a",
   "displayName": "Churches",
   "displayOption": "FitToPage",
diff --git a/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/22d342824000e3cbc7cd/visual.json b/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/22d342824000e3cbc7cd/visual.json
index 31e41ba..80c48a6 100644
--- a/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/22d342824000e3cbc7cd/visual.json
+++ b/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/22d342824000e3cbc7cd/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "22d342824000e3cbc7cd",
   "position": {
     "x": 729.82935153583617,
diff --git a/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/4e529ad821c493623ca9/visual.json b/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/4e529ad821c493623ca9/visual.json
index da797d2..ec67a11 100644
--- a/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/4e529ad821c493623ca9/visual.json
+++ b/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/4e529ad821c493623ca9/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.0.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "4e529ad821c493623ca9",
   "position": {
     "x": 740.27303754266211,
@@ -537,23 +537,5 @@
       ]
     },
     "drillFilterOtherVisuals": true
-  },
-  "filterConfig": {
-    "filters": [
-      {
-        "name": "62a002c4f643213c396a",
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Community"
-              }
-            },
-            "Property": "Community Name"
-          }
-        },
-        "type": "Categorical"
-      }
-    ]
   }
 }
\ No newline at end of file
diff --git a/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/6981b709222874e107d0/visual.json b/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/6981b709222874e107d0/visual.json
index 08cc832..f619079 100644
--- a/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/6981b709222874e107d0/visual.json
+++ b/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/6981b709222874e107d0/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "6981b709222874e107d0",
   "position": {
     "x": 740.27303754266211,
diff --git a/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/791f97066de925631b0b/visual.json b/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/791f97066de925631b0b/visual.json
index 0b2f513..347ff7f 100644
--- a/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/791f97066de925631b0b/visual.json
+++ b/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/791f97066de925631b0b/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "791f97066de925631b0b",
   "position": {
     "x": 729.82935153583617,
diff --git a/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/9fe8b6b1044c073ab264/visual.json b/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/9fe8b6b1044c073ab264/visual.json
index 5d3e4b7..e401397 100644
--- a/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/9fe8b6b1044c073ab264/visual.json
+++ b/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/9fe8b6b1044c073ab264/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "9fe8b6b1044c073ab264",
   "position": {
     "x": 0,
diff --git a/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/aa9a662d4d1104019500/visual.json b/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/aa9a662d4d1104019500/visual.json
index 0c12202..1c185b3 100644
--- a/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/aa9a662d4d1104019500/visual.json
+++ b/CareTogether.Report/definition/pages/101a4b085e432a0c869a/visuals/aa9a662d4d1104019500/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.0.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "aa9a662d4d1104019500",
   "position": {
     "x": 8.6006825938566553,
@@ -713,76 +713,6 @@
         "howCreated": "User",
         "isLockedInViewMode": true
       },
-      {
-        "name": "395fef7fe81c407e030e",
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Entity"
-              }
-            },
-            "Property": "Family Name"
-          }
-        },
-        "type": "Categorical"
-      },
-      {
-        "name": "56b1eebe884ac377118b",
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Entity"
-              }
-            },
-            "Property": "HomeChurch"
-          }
-        },
-        "type": "Categorical"
-      },
-      {
-        "name": "4a625f458d0156cfa425",
-        "field": {
-          "Measure": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Community"
-              }
-            },
-            "Property": "First Community Membership"
-          }
-        },
-        "type": "Advanced"
-      },
-      {
-        "name": "8d19d8075da352acf42d",
-        "field": {
-          "Measure": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Entity"
-              }
-            },
-            "Property": "Community Membership Count"
-          }
-        },
-        "type": "Advanced"
-      },
-      {
-        "name": "1e1cc6d181aab925cc5f",
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Location"
-              }
-            },
-            "Property": "Location"
-          }
-        },
-        "type": "Categorical"
-      },
       {
         "name": "a57b757b6837fc48cf0c",
         "field": {
diff --git a/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/page.json b/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/page.json
index b55e9ba..43fcfe9 100644
--- a/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/page.json
+++ b/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/page.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/1.4.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.0.0/schema.json",
   "name": "148b7f02dc4c0dd0b432",
   "displayName": "Childcare",
   "displayOption": "FitToPage",
diff --git a/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/visuals/348461fc80aca2a3719b/visual.json b/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/visuals/348461fc80aca2a3719b/visual.json
index 58b42c8..12909ed 100644
--- a/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/visuals/348461fc80aca2a3719b/visual.json
+++ b/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/visuals/348461fc80aca2a3719b/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "348461fc80aca2a3719b",
   "position": {
     "x": 374.66666666666669,
diff --git a/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/visuals/42366fa6261927642ada/visual.json b/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/visuals/42366fa6261927642ada/visual.json
index 6e3c160..331d0c5 100644
--- a/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/visuals/42366fa6261927642ada/visual.json
+++ b/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/visuals/42366fa6261927642ada/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "42366fa6261927642ada",
   "position": {
     "x": 9.829351535836178,
diff --git a/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/visuals/91a1cbf0411a520a7dea/visual.json b/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/visuals/91a1cbf0411a520a7dea/visual.json
index 18815c3..460ce62 100644
--- a/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/visuals/91a1cbf0411a520a7dea/visual.json
+++ b/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/visuals/91a1cbf0411a520a7dea/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "91a1cbf0411a520a7dea",
   "position": {
     "x": 10,
diff --git a/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/visuals/947097fbcadeb40770c0/visual.json b/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/visuals/947097fbcadeb40770c0/visual.json
index acba365..d4d973b 100644
--- a/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/visuals/947097fbcadeb40770c0/visual.json
+++ b/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/visuals/947097fbcadeb40770c0/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "947097fbcadeb40770c0",
   "position": {
     "x": 0,
diff --git a/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/visuals/cec66ef7e524732b0413/visual.json b/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/visuals/cec66ef7e524732b0413/visual.json
index 7c56651..70e727f 100644
--- a/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/visuals/cec66ef7e524732b0413/visual.json
+++ b/CareTogether.Report/definition/pages/148b7f02dc4c0dd0b432/visuals/cec66ef7e524732b0413/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "cec66ef7e524732b0413",
   "position": {
     "x": 383.9590443686007,
diff --git a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/page.json b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/page.json
index 20761b9..92c0882 100644
--- a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/page.json
+++ b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/page.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/1.4.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.0.0/schema.json",
   "name": "37baafef208e0e3d0ee7",
   "displayName": "Arrangements",
   "displayOption": "FitToPage",
diff --git a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/0fd45c9be3deb6542a51/visual.json b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/0fd45c9be3deb6542a51/visual.json
index d855200..d83bbf4 100644
--- a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/0fd45c9be3deb6542a51/visual.json
+++ b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/0fd45c9be3deb6542a51/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "0fd45c9be3deb6542a51",
   "position": {
     "x": 650.580204778157,
diff --git a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/109d2aa6c6b3fcb3e93b/visual.json b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/109d2aa6c6b3fcb3e93b/visual.json
index cd5b960..8b0e106 100644
--- a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/109d2aa6c6b3fcb3e93b/visual.json
+++ b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/109d2aa6c6b3fcb3e93b/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "109d2aa6c6b3fcb3e93b",
   "position": {
     "x": 11.058020477815699,
diff --git a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/4d23a7c0fe63b235bc2f/visual.json b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/4d23a7c0fe63b235bc2f/visual.json
index 6e70c16..4aa7dcd 100644
--- a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/4d23a7c0fe63b235bc2f/visual.json
+++ b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/4d23a7c0fe63b235bc2f/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "4d23a7c0fe63b235bc2f",
   "position": {
     "x": 411.60409556313994,
diff --git a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/6ae8b2cbe9a0da1ff832/visual.json b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/6ae8b2cbe9a0da1ff832/visual.json
index 678a097..49d8a43 100644
--- a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/6ae8b2cbe9a0da1ff832/visual.json
+++ b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/6ae8b2cbe9a0da1ff832/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "6ae8b2cbe9a0da1ff832",
   "position": {
     "x": 0,
diff --git a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/79a9c339aadd59d38bdf/visual.json b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/79a9c339aadd59d38bdf/visual.json
index 96fb9d7..0acd5d2 100644
--- a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/79a9c339aadd59d38bdf/visual.json
+++ b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/79a9c339aadd59d38bdf/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "79a9c339aadd59d38bdf",
   "position": {
     "x": 11.058020477815699,
diff --git a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/a16f9f0815079463602f/visual.json b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/a16f9f0815079463602f/visual.json
index 0dcecc1..5764b94 100644
--- a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/a16f9f0815079463602f/visual.json
+++ b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/a16f9f0815079463602f/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "a16f9f0815079463602f",
   "position": {
     "x": 402.38907849829354,
diff --git a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/ae2c44aec4ea25b3e446/visual.json b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/ae2c44aec4ea25b3e446/visual.json
index dce87c9..6d29fb6 100644
--- a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/ae2c44aec4ea25b3e446/visual.json
+++ b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/ae2c44aec4ea25b3e446/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "ae2c44aec4ea25b3e446",
   "position": {
     "x": 0,
diff --git a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/c06f577cd3e33ba28778/visual.json b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/c06f577cd3e33ba28778/visual.json
index 118202f..e087b5b 100644
--- a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/c06f577cd3e33ba28778/visual.json
+++ b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/c06f577cd3e33ba28778/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "c06f577cd3e33ba28778",
   "position": {
     "x": 11.058020477815699,
diff --git a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/e2a0619cd95abc946ed7/visual.json b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/e2a0619cd95abc946ed7/visual.json
index f831678..16cd0e2 100644
--- a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/e2a0619cd95abc946ed7/visual.json
+++ b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/e2a0619cd95abc946ed7/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "e2a0619cd95abc946ed7",
   "position": {
     "x": 11.058020477815699,
diff --git a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/e42565cd0c3354b70766/visual.json b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/e42565cd0c3354b70766/visual.json
index 1931403..67414a9 100644
--- a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/e42565cd0c3354b70766/visual.json
+++ b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/e42565cd0c3354b70766/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "e42565cd0c3354b70766",
   "position": {
     "x": 640.13651877133111,
diff --git a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/ef67809e67292fd68f81/visual.json b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/ef67809e67292fd68f81/visual.json
index 69cd36f..bfcb892 100644
--- a/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/ef67809e67292fd68f81/visual.json
+++ b/CareTogether.Report/definition/pages/37baafef208e0e3d0ee7/visuals/ef67809e67292fd68f81/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "ef67809e67292fd68f81",
   "position": {
     "x": 0,
diff --git a/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/page.json b/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/page.json
index add53d4..90e7a66 100644
--- a/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/page.json
+++ b/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/page.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/1.4.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.0.0/schema.json",
   "name": "3998b4c8362c11ddd270",
   "displayName": "Referrals",
   "displayOption": "FitToPage",
diff --git a/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/02e88b37c5d5e53e909e/visual.json b/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/02e88b37c5d5e53e909e/visual.json
index e6d4ab8..897b76d 100644
--- a/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/02e88b37c5d5e53e909e/visual.json
+++ b/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/02e88b37c5d5e53e909e/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "02e88b37c5d5e53e909e",
   "position": {
     "x": 384,
diff --git a/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/3841f32c6923a53d5ab6/visual.json b/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/3841f32c6923a53d5ab6/visual.json
index 546a35d..c65abd5 100644
--- a/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/3841f32c6923a53d5ab6/visual.json
+++ b/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/3841f32c6923a53d5ab6/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "3841f32c6923a53d5ab6",
   "position": {
     "x": 374.66666666666669,
diff --git a/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/3ef6a6b372000a93260a/visual.json b/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/3ef6a6b372000a93260a/visual.json
index a9a9547..1199dc2 100644
--- a/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/3ef6a6b372000a93260a/visual.json
+++ b/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/3ef6a6b372000a93260a/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "3ef6a6b372000a93260a",
   "position": {
     "x": 0,
diff --git a/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/42969c1470d00de21b32/visual.json b/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/42969c1470d00de21b32/visual.json
index d363ec2..7a06a47 100644
--- a/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/42969c1470d00de21b32/visual.json
+++ b/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/42969c1470d00de21b32/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "42969c1470d00de21b32",
   "position": {
     "x": 374.66666666666669,
diff --git a/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/90a5a7f11907add9925a/visual.json b/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/90a5a7f11907add9925a/visual.json
index 6c9b85b..0636636 100644
--- a/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/90a5a7f11907add9925a/visual.json
+++ b/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/90a5a7f11907add9925a/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "90a5a7f11907add9925a",
   "position": {
     "x": 9.829351535836178,
diff --git a/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/97eef52545600b557893/visual.json b/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/97eef52545600b557893/visual.json
index 56c320c..b551e8b 100644
--- a/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/97eef52545600b557893/visual.json
+++ b/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/97eef52545600b557893/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "97eef52545600b557893",
   "position": {
     "x": 0,
diff --git a/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/c9bce1a7c4a078922d76/visual.json b/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/c9bce1a7c4a078922d76/visual.json
index 6d2003f..d3a8a6e 100644
--- a/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/c9bce1a7c4a078922d76/visual.json
+++ b/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/c9bce1a7c4a078922d76/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "c9bce1a7c4a078922d76",
   "position": {
     "x": 384,
diff --git a/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/cfcd19cbd020ce5267a3/visual.json b/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/cfcd19cbd020ce5267a3/visual.json
index 0c68821..6d6614b 100644
--- a/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/cfcd19cbd020ce5267a3/visual.json
+++ b/CareTogether.Report/definition/pages/3998b4c8362c11ddd270/visuals/cfcd19cbd020ce5267a3/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "cfcd19cbd020ce5267a3",
   "position": {
     "x": 9.829351535836178,
diff --git a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/page.json b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/page.json
index eed9fbf..52260eb 100644
--- a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/page.json
+++ b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/page.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/1.4.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.0.0/schema.json",
   "name": "7ff2cfc14b864ab32dab",
   "displayName": "Engagement",
   "displayOption": "FitToPage",
diff --git a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/06ec0951a4a50e37927b/visual.json b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/06ec0951a4a50e37927b/visual.json
index 90f7f82..77c3057 100644
--- a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/06ec0951a4a50e37927b/visual.json
+++ b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/06ec0951a4a50e37927b/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "06ec0951a4a50e37927b",
   "position": {
     "x": 0,
diff --git a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/1fba175e004611a9b13a/visual.json b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/1fba175e004611a9b13a/visual.json
index be54d42..06bd473 100644
--- a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/1fba175e004611a9b13a/visual.json
+++ b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/1fba175e004611a9b13a/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.0.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "1fba175e004611a9b13a",
   "position": {
     "x": 640.13651877133111,
@@ -578,62 +578,6 @@
             }
           ]
         }
-      },
-      {
-        "name": "76486043152c0b40a354",
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Entity"
-              }
-            },
-            "Property": "Family Name"
-          }
-        },
-        "type": "Categorical"
-      },
-      {
-        "name": "0de09770644018286015",
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Arrangement"
-              }
-            },
-            "Property": "Full Name"
-          }
-        },
-        "type": "Categorical"
-      },
-      {
-        "name": "334873341a5c90c6dea0",
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Arrangement Type"
-              }
-            },
-            "Property": "Arrangement Type"
-          }
-        },
-        "type": "Categorical"
-      },
-      {
-        "name": "0c2b2993b3501070e013",
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Arrangement"
-              }
-            },
-            "Property": "Id"
-          }
-        },
-        "type": "Categorical"
       }
     ]
   }
diff --git a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/586be121e29e55589a30/visual.json b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/586be121e29e55589a30/visual.json
index 75f0849..ca59b67 100644
--- a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/586be121e29e55589a30/visual.json
+++ b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/586be121e29e55589a30/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.0.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "586be121e29e55589a30",
   "position": {
     "x": 11.058020477815699,
@@ -634,62 +634,6 @@
             }
           ]
         }
-      },
-      {
-        "name": "a3844bdd5f6233fcbcbf",
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Function Assignments"
-              }
-            },
-            "Property": "EntityId"
-          }
-        },
-        "type": "Categorical"
-      },
-      {
-        "name": "7df8b72de5c2e0dca372",
-        "field": {
-          "Measure": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Engagement by Entity"
-              }
-            },
-            "Property": "Dynamic Entity Name (Engagement)"
-          }
-        },
-        "type": "Advanced"
-      },
-      {
-        "name": "5c6dd980d61bb58a6114",
-        "field": {
-          "Measure": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Entity"
-              }
-            },
-            "Property": "Entity Last Assignment Date"
-          }
-        },
-        "type": "Advanced"
-      },
-      {
-        "name": "0ea8bcf8cdb3066d11ea",
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Entity"
-              }
-            },
-            "Property": "Participation Type"
-          }
-        },
-        "type": "Categorical"
       }
     ]
   }
diff --git a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/5a601801c61809915dd9/visual.json b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/5a601801c61809915dd9/visual.json
index 12c8627..a828d33 100644
--- a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/5a601801c61809915dd9/visual.json
+++ b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/5a601801c61809915dd9/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "5a601801c61809915dd9",
   "position": {
     "x": 0,
diff --git a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/5bbba6e903b286db133d/visual.json b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/5bbba6e903b286db133d/visual.json
index edbe3c5..96555d4 100644
--- a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/5bbba6e903b286db133d/visual.json
+++ b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/5bbba6e903b286db133d/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "5bbba6e903b286db133d",
   "position": {
     "x": 10.443686006825939,
diff --git a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/6e43ba7c4e3980530203/visual.json b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/6e43ba7c4e3980530203/visual.json
index 97e33ad..e46402f 100644
--- a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/6e43ba7c4e3980530203/visual.json
+++ b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/6e43ba7c4e3980530203/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "6e43ba7c4e3980530203",
   "position": {
     "x": 0,
diff --git a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/6f6302f57c257020062a/visual.json b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/6f6302f57c257020062a/visual.json
index 328580b..f7d3312 100644
--- a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/6f6302f57c257020062a/visual.json
+++ b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/6f6302f57c257020062a/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.0.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "6f6302f57c257020062a",
   "position": {
     "x": 11.058020477815699,
@@ -377,23 +377,5 @@
       ]
     },
     "drillFilterOtherVisuals": true
-  },
-  "filterConfig": {
-    "filters": [
-      {
-        "name": "550ae20ce4cb6c26ac41",
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Engagement by Entity"
-              }
-            },
-            "Property": "Entity Type"
-          }
-        },
-        "type": "Categorical"
-      }
-    ]
   }
 }
\ No newline at end of file
diff --git a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/84c6b3651bbe74067bc4/visual.json b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/84c6b3651bbe74067bc4/visual.json
index 3cb735f..26abcb2 100644
--- a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/84c6b3651bbe74067bc4/visual.json
+++ b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/84c6b3651bbe74067bc4/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "84c6b3651bbe74067bc4",
   "position": {
     "x": 364.91467576791808,
diff --git a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/bc13df403a5b7c10b485/visual.json b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/bc13df403a5b7c10b485/visual.json
index cb33d91..01406bc 100644
--- a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/bc13df403a5b7c10b485/visual.json
+++ b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/bc13df403a5b7c10b485/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "bc13df403a5b7c10b485",
   "position": {
     "x": 374.74402730375425,
diff --git a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/f0e43f9fd05668cac760/visual.json b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/f0e43f9fd05668cac760/visual.json
index d498eec..cb99683 100644
--- a/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/f0e43f9fd05668cac760/visual.json
+++ b/CareTogether.Report/definition/pages/7ff2cfc14b864ab32dab/visuals/f0e43f9fd05668cac760/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "f0e43f9fd05668cac760",
   "position": {
     "x": 10.443686006825939,
diff --git a/CareTogether.Report/definition/pages/96791911d9aa80a413e8/page.json b/CareTogether.Report/definition/pages/96791911d9aa80a413e8/page.json
index cacd717..0542975 100644
--- a/CareTogether.Report/definition/pages/96791911d9aa80a413e8/page.json
+++ b/CareTogether.Report/definition/pages/96791911d9aa80a413e8/page.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/1.3.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.0.0/schema.json",
   "name": "96791911d9aa80a413e8",
   "displayName": "Contact Data",
   "displayOption": "FitToPage",
diff --git a/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/15e4699ba40a42950a26/visual.json b/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/15e4699ba40a42950a26/visual.json
deleted file mode 100644
index 0868d67..0000000
--- a/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/15e4699ba40a42950a26/visual.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
-  "name": "15e4699ba40a42950a26",
-  "position": {
-    "x": 364.91467576791808,
-    "y": 0,
-    "z": 3000,
-    "height": 106.27986348122867,
-    "width": 915.358361774744,
-    "tabOrder": 3000
-  },
-  "visual": {
-    "visualType": "shape",
-    "objects": {
-      "shape": [
-        {
-          "properties": {
-            "tileShape": {
-              "expr": {
-                "Literal": {
-                  "Value": "'rectangle'"
-                }
-              }
-            },
-            "roundEdge": {
-              "expr": {
-                "Literal": {
-                  "Value": "10L"
-                }
-              }
-            }
-          }
-        }
-      ],
-      "rotation": [
-        {
-          "properties": {
-            "shapeAngle": {
-              "expr": {
-                "Literal": {
-                  "Value": "0L"
-                }
-              }
-            }
-          }
-        }
-      ],
-      "fill": [
-        {
-          "properties": {
-            "fillColor": {
-              "solid": {
-                "color": {
-                  "expr": {
-                    "Literal": {
-                      "Value": "'#FFFFFF'"
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "selector": {
-            "id": "default"
-          }
-        },
-        {
-          "properties": {
-            "show": {
-              "expr": {
-                "Literal": {
-                  "Value": "true"
-                }
-              }
-            }
-          }
-        }
-      ],
-      "outline": [
-        {
-          "properties": {
-            "show": {
-              "expr": {
-                "Literal": {
-                  "Value": "false"
-                }
-              }
-            }
-          }
-        }
-      ]
-    },
-    "visualContainerObjects": {
-      "padding": [
-        {
-          "properties": {
-            "left": {
-              "expr": {
-                "Literal": {
-                  "Value": "10D"
-                }
-              }
-            },
-            "top": {
-              "expr": {
-                "Literal": {
-                  "Value": "10D"
-                }
-              }
-            },
-            "right": {
-              "expr": {
-                "Literal": {
-                  "Value": "10D"
-                }
-              }
-            },
-            "bottom": {
-              "expr": {
-                "Literal": {
-                  "Value": "0D"
-                }
-              }
-            }
-          }
-        }
-      ]
-    },
-    "drillFilterOtherVisuals": true
-  },
-  "howCreated": "InsertVisualButton"
-}
\ No newline at end of file
diff --git a/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/1ba4ddbe1a8a2c669596/visual.json b/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/1ba4ddbe1a8a2c669596/visual.json
deleted file mode 100644
index f25bdc7..0000000
--- a/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/1ba4ddbe1a8a2c669596/visual.json
+++ /dev/null
@@ -1,399 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.0.0/schema.json",
-  "name": "1ba4ddbe1a8a2c669596",
-  "position": {
-    "x": 10.443686006825939,
-    "y": 9.829351535836178,
-    "z": 2000,
-    "height": 96.450511945392492,
-    "width": 354.47098976109214,
-    "tabOrder": 2000
-  },
-  "visual": {
-    "visualType": "slicer",
-    "query": {
-      "queryState": {
-        "Values": {
-          "projections": [
-            {
-              "field": {
-                "Column": {
-                  "Expression": {
-                    "SourceRef": {
-                      "Entity": "Export Contacts"
-                    }
-                  },
-                  "Property": "Entity Type"
-                }
-              },
-              "queryRef": "Export Contacts.Entity Type",
-              "nativeQueryRef": "Entity Type",
-              "active": true
-            }
-          ]
-        }
-      }
-    },
-    "objects": {
-      "data": [
-        {
-          "properties": {
-            "mode": {
-              "expr": {
-                "Literal": {
-                  "Value": "'Basic'"
-                }
-              }
-            }
-          }
-        }
-      ],
-      "selection": [
-        {
-          "properties": {
-            "strictSingleSelect": {
-              "expr": {
-                "Literal": {
-                  "Value": "true"
-                }
-              }
-            }
-          }
-        }
-      ],
-      "general": [
-        {
-          "properties": {
-            "orientation": {
-              "expr": {
-                "Literal": {
-                  "Value": "1D"
-                }
-              }
-            },
-            "responsive": {
-              "expr": {
-                "Literal": {
-                  "Value": "true"
-                }
-              }
-            },
-            "filter": {
-              "filter": {
-                "Version": 2,
-                "From": [
-                  {
-                    "Name": "e",
-                    "Entity": "Export Contacts",
-                    "Type": 0
-                  }
-                ],
-                "Where": [
-                  {
-                    "Condition": {
-                      "In": {
-                        "Expressions": [
-                          {
-                            "Column": {
-                              "Expression": {
-                                "SourceRef": {
-                                  "Source": "e"
-                                }
-                              },
-                              "Property": "Entity Type"
-                            }
-                          }
-                        ],
-                        "Values": [
-                          [
-                            {
-                              "Literal": {
-                                "Value": "'Family'"
-                              }
-                            }
-                          ]
-                        ]
-                      }
-                    }
-                  }
-                ]
-              }
-            }
-          }
-        }
-      ],
-      "items": [
-        {
-          "properties": {
-            "background": {
-              "solid": {
-                "color": {
-                  "expr": {
-                    "Literal": {
-                      "Value": "'#FFFFFF'"
-                    }
-                  }
-                }
-              }
-            },
-            "outlineStyle": {
-              "expr": {
-                "Literal": {
-                  "Value": "0D"
-                }
-              }
-            },
-            "textSize": {
-              "expr": {
-                "Literal": {
-                  "Value": "8D"
-                }
-              }
-            },
-            "fontColor": {
-              "solid": {
-                "color": {
-                  "expr": {
-                    "Literal": {
-                      "Value": "'#212121'"
-                    }
-                  }
-                }
-              }
-            },
-            "padding": {
-              "expr": {
-                "Literal": {
-                  "Value": "5D"
-                }
-              }
-            }
-          }
-        }
-      ],
-      "header": [
-        {
-          "properties": {
-            "show": {
-              "expr": {
-                "Literal": {
-                  "Value": "false"
-                }
-              }
-            }
-          }
-        }
-      ]
-    },
-    "visualContainerObjects": {
-      "background": [
-        {
-          "properties": {
-            "show": {
-              "expr": {
-                "Literal": {
-                  "Value": "false"
-                }
-              }
-            }
-          }
-        }
-      ],
-      "title": [
-        {
-          "properties": {
-            "show": {
-              "expr": {
-                "Literal": {
-                  "Value": "true"
-                }
-              }
-            },
-            "text": {
-              "expr": {
-                "Literal": {
-                  "Value": "'Entity Type'"
-                }
-              }
-            },
-            "fontSize": {
-              "expr": {
-                "Literal": {
-                  "Value": "10D"
-                }
-              }
-            },
-            "fontColor": {
-              "solid": {
-                "color": {
-                  "expr": {
-                    "Literal": {
-                      "Value": "'#212121'"
-                    }
-                  }
-                }
-              }
-            },
-            "bold": {
-              "expr": {
-                "Literal": {
-                  "Value": "true"
-                }
-              }
-            }
-          }
-        }
-      ],
-      "padding": [
-        {
-          "properties": {
-            "top": {
-              "expr": {
-                "Literal": {
-                  "Value": "20D"
-                }
-              }
-            },
-            "bottom": {
-              "expr": {
-                "Literal": {
-                  "Value": "20D"
-                }
-              }
-            },
-            "right": {
-              "expr": {
-                "Literal": {
-                  "Value": "20D"
-                }
-              }
-            },
-            "left": {
-              "expr": {
-                "Literal": {
-                  "Value": "20D"
-                }
-              }
-            }
-          }
-        }
-      ],
-      "subTitle": [
-        {
-          "properties": {
-            "show": {
-              "expr": {
-                "Literal": {
-                  "Value": "true"
-                }
-              }
-            },
-            "text": {
-              "expr": {
-                "Literal": {
-                  "Value": "'Use the slicer to choose the category that best fits your analysis.'"
-                }
-              }
-            },
-            "fontSize": {
-              "expr": {
-                "Literal": {
-                  "Value": "8D"
-                }
-              }
-            },
-            "fontColor": {
-              "solid": {
-                "color": {
-                  "expr": {
-                    "Literal": {
-                      "Value": "'#9A9A9A'"
-                    }
-                  }
-                }
-              }
-            },
-            "titleWrap": {
-              "expr": {
-                "Literal": {
-                  "Value": "true"
-                }
-              }
-            }
-          }
-        }
-      ],
-      "border": [
-        {
-          "properties": {
-            "show": {
-              "expr": {
-                "Literal": {
-                  "Value": "false"
-                }
-              }
-            }
-          }
-        }
-      ],
-      "dropShadow": [
-        {
-          "properties": {
-            "show": {
-              "expr": {
-                "Literal": {
-                  "Value": "false"
-                }
-              }
-            }
-          }
-        }
-      ],
-      "visualHeader": [
-        {
-          "properties": {
-            "show": {
-              "expr": {
-                "Literal": {
-                  "Value": "false"
-                }
-              }
-            }
-          }
-        }
-      ],
-      "general": [
-        {
-          "properties": {
-            "keepLayerOrder": {
-              "expr": {
-                "Literal": {
-                  "Value": "false"
-                }
-              }
-            }
-          }
-        }
-      ]
-    },
-    "drillFilterOtherVisuals": true
-  },
-  "filterConfig": {
-    "filters": [
-      {
-        "name": "68d230d62b10651d29c8",
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Export Contacts"
-              }
-            },
-            "Property": "Entity Type"
-          }
-        },
-        "type": "Categorical"
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/515532404829503c7299/visual.json b/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/515532404829503c7299/visual.json
index bd8adda..a369252 100644
--- a/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/515532404829503c7299/visual.json
+++ b/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/515532404829503c7299/visual.json
@@ -1,13 +1,13 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "515532404829503c7299",
   "position": {
     "x": 0,
-    "y": 106.27986348122867,
-    "z": 1000,
-    "height": 613.72013651877137,
+    "y": 0,
+    "z": 0,
+    "height": 720,
     "width": 1280.2730375426622,
-    "tabOrder": 1000
+    "tabOrder": 0
   },
   "visual": {
     "visualType": "shape",
diff --git a/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/e3a4a3818596e3008831/visual.json b/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/9b68b6ad157412dbb610/visual.json
similarity index 81%
rename from CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/e3a4a3818596e3008831/visual.json
rename to CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/9b68b6ad157412dbb610/visual.json
index 4f7f92c..7ae2341 100644
--- a/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/e3a4a3818596e3008831/visual.json
+++ b/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/9b68b6ad157412dbb610/visual.json
@@ -1,13 +1,13 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.0.0/schema.json",
-  "name": "e3a4a3818596e3008831",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
+  "name": "9b68b6ad157412dbb610",
   "position": {
     "x": 10.443686006825939,
-    "y": 116.7235494880546,
-    "z": 4000,
-    "height": 593.44709897610926,
+    "y": 99.5221843003413,
+    "z": 3000,
+    "height": 608.80546075085329,
     "width": 1260,
-    "tabOrder": 4000
+    "tabOrder": 3000
   },
   "visual": {
     "visualType": "tableEx",
@@ -15,20 +15,64 @@
       "queryState": {
         "Values": {
           "projections": [
+            {
+              "field": {
+                "Column": {
+                  "Expression": {
+                    "SourceRef": {
+                      "Entity": "Entity"
+                    }
+                  },
+                  "Property": "Family Name"
+                }
+              },
+              "queryRef": "Entity.Family Name",
+              "nativeQueryRef": "Family Name"
+            },
             {
               "field": {
                 "Measure": {
                   "Expression": {
                     "SourceRef": {
-                      "Entity": "Export Contacts"
+                      "Entity": "Role Approval"
                     }
                   },
-                  "Property": "Dynamic Entity Name (Approval)"
+                  "Property": "Volunteer Family Status Flag"
                 }
               },
-              "queryRef": "Export Contacts.Dynamic Entity Name (Approval)",
-              "nativeQueryRef": "Name",
-              "displayName": "Name"
+              "queryRef": "Role Approval.Volunteer Family Status Flag",
+              "nativeQueryRef": "Family Status",
+              "displayName": "Family Status"
+            },
+            {
+              "field": {
+                "Column": {
+                  "Expression": {
+                    "SourceRef": {
+                      "Entity": "Entity"
+                    }
+                  },
+                  "Property": "Full Name"
+                }
+              },
+              "queryRef": "Entity.Full Name",
+              "nativeQueryRef": "Person Name",
+              "displayName": "Person Name"
+            },
+            {
+              "field": {
+                "Measure": {
+                  "Expression": {
+                    "SourceRef": {
+                      "Entity": "Role Approval"
+                    }
+                  },
+                  "Property": "Volunteer Individual Status Flag"
+                }
+              },
+              "queryRef": "Role Approval.Volunteer Individual Status Flag",
+              "nativeQueryRef": "Person Status",
+              "displayName": "Person Status"
             },
             {
               "field": {
@@ -114,20 +158,6 @@
               "queryRef": "Entity.County",
               "nativeQueryRef": "County"
             },
-            {
-              "field": {
-                "Column": {
-                  "Expression": {
-                    "SourceRef": {
-                      "Entity": "Entity"
-                    }
-                  },
-                  "Property": "State"
-                }
-              },
-              "queryRef": "Entity.State",
-              "nativeQueryRef": "State"
-            },
             {
               "field": {
                 "Column": {
@@ -141,21 +171,6 @@
               },
               "queryRef": "Entity.PostalCode",
               "nativeQueryRef": "PostalCode"
-            },
-            {
-              "field": {
-                "Column": {
-                  "Expression": {
-                    "SourceRef": {
-                      "Entity": "Entity"
-                    }
-                  },
-                  "Property": "FamilyId"
-                }
-              },
-              "queryRef": "Entity.FamilyId",
-              "nativeQueryRef": " ",
-              "displayName": " "
             }
           ]
         }
@@ -164,13 +179,13 @@
         "sort": [
           {
             "field": {
-              "Measure": {
+              "Column": {
                 "Expression": {
                   "SourceRef": {
-                    "Entity": "Export Contacts"
+                    "Entity": "Entity"
                   }
                 },
-                "Property": "Dynamic Entity Name (Approval)"
+                "Property": "Family Name"
               }
             },
             "direction": "Ascending"
@@ -179,6 +194,44 @@
       }
     },
     "objects": {
+      "grid": [
+        {
+          "properties": {
+            "outlineStyle": {
+              "expr": {
+                "Literal": {
+                  "Value": "0D"
+                }
+              }
+            },
+            "outlineColor": {
+              "solid": {
+                "color": {
+                  "expr": {
+                    "Literal": {
+                      "Value": "'#EFEFEF'"
+                    }
+                  }
+                }
+              }
+            },
+            "gridHorizontal": {
+              "expr": {
+                "Literal": {
+                  "Value": "false"
+                }
+              }
+            },
+            "rowPadding": {
+              "expr": {
+                "Literal": {
+                  "Value": "4D"
+                }
+              }
+            }
+          }
+        }
+      ],
       "values": [
         {
           "properties": {
@@ -257,63 +310,58 @@
             "value": {
               "expr": {
                 "Literal": {
-                  "Value": "4D"
+                  "Value": "144.68612033644854D"
                 }
               }
             }
           },
           "selector": {
-            "metadata": "Entity.FamilyId"
+            "metadata": "Entity.Full Name"
           }
-        }
-      ],
-      "total": [
+        },
         {
           "properties": {
-            "totals": {
+            "value": {
               "expr": {
                 "Literal": {
-                  "Value": "false"
+                  "Value": "137.61774821355488D"
                 }
               }
             }
+          },
+          "selector": {
+            "metadata": "Role Approval.Volunteer Family Status Flag"
           }
-        }
-      ],
-      "grid": [
+        },
         {
           "properties": {
-            "outlineStyle": {
+            "value": {
               "expr": {
                 "Literal": {
-                  "Value": "0D"
+                  "Value": "114.04436525992223D"
                 }
               }
-            },
-            "outlineColor": {
-              "solid": {
-                "color": {
-                  "expr": {
-                    "Literal": {
-                      "Value": "'#EFEFEF'"
-                    }
-                  }
-                }
-              }
-            },
-            "gridHorizontal": {
+            }
+          },
+          "selector": {
+            "metadata": "Role Approval.Volunteer Individual Status Flag"
+          }
+        }
+      ],
+      "general": [
+        {
+          "properties": {}
+        }
+      ],
+      "total": [
+        {
+          "properties": {
+            "totals": {
               "expr": {
                 "Literal": {
                   "Value": "false"
                 }
               }
-            },
-            "rowPadding": {
-              "expr": {
-                "Literal": {
-                  "Value": "4D"
-                }
-              }
             }
           }
         }
@@ -361,13 +409,6 @@
                   "Value": "true"
                 }
               }
-            },
-            "text": {
-              "expr": {
-                "Literal": {
-                  "Value": "' '"
-                }
-              }
             }
           }
         }
@@ -399,13 +440,6 @@
                   "Value": "8D"
                 }
               }
-            },
-            "text": {
-              "expr": {
-                "Literal": {
-                  "Value": "' '"
-                }
-              }
             }
           }
         }
@@ -573,7 +607,7 @@
   "filterConfig": {
     "filters": [
       {
-        "name": "67c06ee220eb80ed0854",
+        "name": "f99a5827ac2405aab80b",
         "ordinal": 0,
         "field": {
           "Column": {
@@ -582,63 +616,14 @@
                 "Entity": "Entity"
               }
             },
-            "Property": "FamilyId"
+            "Property": "Address Line 1"
           }
         },
-        "type": "Categorical",
-        "isHiddenInViewMode": true,
-        "isLockedInViewMode": true
+        "type": "Categorical"
       },
       {
-        "name": "d86ad02a0353ac215e68",
+        "name": "f9595f50402a33842bed",
         "ordinal": 1,
-        "field": {
-          "Measure": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Export Contacts"
-              }
-            },
-            "Property": "Dynamic Entity Name (Approval)"
-          }
-        },
-        "type": "Advanced"
-      },
-      {
-        "name": "8d3fee0bc3786443ae75",
-        "ordinal": 2,
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Community"
-              }
-            },
-            "Property": "Community Name"
-          }
-        },
-        "type": "Categorical",
-        "howCreated": "User",
-        "objects": {
-          "general": [
-            {
-              "properties": {
-                "isInvertedSelectionMode": {
-                  "expr": {
-                    "Literal": {
-                      "Value": "true"
-                    }
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      {
-        "name": "40ff275d3bd75824b141",
-        "displayName": "Home Church",
-        "ordinal": 3,
         "field": {
           "Column": {
             "Expression": {
@@ -646,31 +631,14 @@
                 "Entity": "Entity"
               }
             },
-            "Property": "HomeChurch"
-          }
-        },
-        "type": "Categorical",
-        "howCreated": "User"
-      },
-      {
-        "name": "7172210ecd3bc2cdaba3",
-        "ordinal": 4,
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Role"
-              }
-            },
-            "Property": "Role Name"
+            "Property": "Address Line 2"
           }
         },
-        "type": "Categorical",
-        "howCreated": "User"
+        "type": "Categorical"
       },
       {
-        "name": "62a32508d20b530641b4",
-        "ordinal": 5,
+        "name": "0877463cd61a00ca087b",
+        "ordinal": 2,
         "field": {
           "Column": {
             "Expression": {
@@ -678,14 +646,14 @@
                 "Entity": "Entity"
               }
             },
-            "Property": "Address Line 1"
+            "Property": "City"
           }
         },
         "type": "Categorical"
       },
       {
-        "name": "52c57556805a585470c7",
-        "ordinal": 6,
+        "name": "6bee80ccc1ae4a035646",
+        "ordinal": 3,
         "field": {
           "Column": {
             "Expression": {
@@ -693,14 +661,14 @@
                 "Entity": "Entity"
               }
             },
-            "Property": "Address Line 2"
+            "Property": "County"
           }
         },
         "type": "Categorical"
       },
       {
-        "name": "da9529a317c661d2378a",
-        "ordinal": 7,
+        "name": "4a816c80b883e0006b28",
+        "ordinal": 4,
         "field": {
           "Column": {
             "Expression": {
@@ -708,14 +676,14 @@
                 "Entity": "Entity"
               }
             },
-            "Property": "City"
+            "Property": "Email"
           }
         },
         "type": "Categorical"
       },
       {
-        "name": "5bc9fa6c59a03523306e",
-        "ordinal": 8,
+        "name": "c1907b530500447ba701",
+        "ordinal": 5,
         "field": {
           "Column": {
             "Expression": {
@@ -723,29 +691,59 @@
                 "Entity": "Entity"
               }
             },
-            "Property": "County"
+            "Property": "Family Name"
           }
         },
-        "type": "Categorical"
-      },
-      {
-        "name": "0f2cdaf0b78a78b7004b",
-        "ordinal": 9,
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Entity"
+        "type": "Advanced",
+        "filter": {
+          "Version": 2,
+          "From": [
+            {
+              "Name": "e",
+              "Entity": "Entity",
+              "Type": 0
+            }
+          ],
+          "Where": [
+            {
+              "Condition": {
+                "Not": {
+                  "Expression": {
+                    "Comparison": {
+                      "ComparisonKind": 0,
+                      "Left": {
+                        "Column": {
+                          "Expression": {
+                            "SourceRef": {
+                              "Source": "e"
+                            }
+                          },
+                          "Property": "Family Name"
+                        }
+                      },
+                      "Right": {
+                        "Literal": {
+                          "Value": "null"
+                        }
+                      }
+                    }
+                  }
+                }
               }
-            },
-            "Property": "Email"
-          }
+            }
+          ]
         },
-        "type": "Categorical"
+        "objects": {
+          "general": [
+            {
+              "properties": {}
+            }
+          ]
+        }
       },
       {
-        "name": "c3d10f0cbc5431251c1a",
-        "ordinal": 10,
+        "name": "d74e135dda07d1238a4b",
+        "ordinal": 6,
         "field": {
           "Column": {
             "Expression": {
@@ -753,14 +751,14 @@
                 "Entity": "Entity"
               }
             },
-            "Property": "Phone Number"
+            "Property": "Full Name"
           }
         },
         "type": "Categorical"
       },
       {
-        "name": "4ed43f684a2bc5ac29d9",
-        "ordinal": 11,
+        "name": "c129bfdb2949b473ee09",
+        "ordinal": 7,
         "field": {
           "Column": {
             "Expression": {
@@ -768,14 +766,14 @@
                 "Entity": "Entity"
               }
             },
-            "Property": "PostalCode"
+            "Property": "Phone Number"
           }
         },
         "type": "Categorical"
       },
       {
-        "name": "e645b7486bbb703e1b7d",
-        "ordinal": 12,
+        "name": "c8894cb0dd5505e07825",
+        "ordinal": 8,
         "field": {
           "Column": {
             "Expression": {
@@ -783,63 +781,44 @@
                 "Entity": "Entity"
               }
             },
-            "Property": "State"
+            "Property": "PostalCode"
           }
         },
         "type": "Categorical"
       },
       {
-        "name": "07d619698618b6ea0d40",
-        "ordinal": 13,
+        "name": "d44446935aa3ee16a464",
+        "ordinal": 9,
         "field": {
           "Measure": {
             "Expression": {
               "SourceRef": {
-                "Entity": "Entity"
+                "Entity": "Role Approval"
               }
             },
-            "Property": "Entity Last Assignment Date"
+            "Property": "Volunteer Family Status Flag"
           }
         },
-        "type": "Advanced",
-        "howCreated": "User",
-        "isLockedInViewMode": true
+        "type": "Advanced"
       },
       {
-        "name": "ccafc08ecbb0ab24d70d",
-        "ordinal": 14,
+        "name": "7384fde40366b1a17057",
+        "ordinal": 10,
         "field": {
-          "Column": {
+          "Measure": {
             "Expression": {
               "SourceRef": {
-                "Entity": "Entity"
+                "Entity": "Role Approval"
               }
             },
-            "Property": "Participation Type"
+            "Property": "Volunteer Individual Status Flag"
           }
         },
-        "type": "Categorical",
-        "howCreated": "User",
-        "isLockedInViewMode": true,
-        "objects": {
-          "general": [
-            {
-              "properties": {
-                "isInvertedSelectionMode": {
-                  "expr": {
-                    "Literal": {
-                      "Value": "true"
-                    }
-                  }
-                }
-              }
-            }
-          ]
-        }
+        "type": "Advanced"
       },
       {
-        "name": "97533da7124c7c76f41c",
-        "ordinal": 15,
+        "name": "2dab7609b64d602e1ed0",
+        "ordinal": 11,
         "field": {
           "Measure": {
             "Expression": {
@@ -890,7 +869,8 @@
           ]
         },
         "howCreated": "User",
-        "isHiddenInViewMode": true
+        "isHiddenInViewMode": true,
+        "isLockedInViewMode": true
       }
     ],
     "filterSortOrder": "Custom"
diff --git a/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/db89c35e010e65674b08/visual.json b/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/db89c35e010e65674b08/visual.json
deleted file mode 100644
index 7e2083b..0000000
--- a/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/db89c35e010e65674b08/visual.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
-  "name": "db89c35e010e65674b08",
-  "position": {
-    "x": 0,
-    "y": 0,
-    "z": 0,
-    "height": 106.27986348122867,
-    "width": 364.91467576791808,
-    "tabOrder": 0
-  },
-  "visual": {
-    "visualType": "shape",
-    "objects": {
-      "shape": [
-        {
-          "properties": {
-            "tileShape": {
-              "expr": {
-                "Literal": {
-                  "Value": "'rectangle'"
-                }
-              }
-            },
-            "roundEdge": {
-              "expr": {
-                "Literal": {
-                  "Value": "10L"
-                }
-              }
-            }
-          }
-        }
-      ],
-      "rotation": [
-        {
-          "properties": {
-            "shapeAngle": {
-              "expr": {
-                "Literal": {
-                  "Value": "0L"
-                }
-              }
-            }
-          }
-        }
-      ],
-      "fill": [
-        {
-          "properties": {
-            "fillColor": {
-              "solid": {
-                "color": {
-                  "expr": {
-                    "Literal": {
-                      "Value": "'#FFFFFF'"
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "selector": {
-            "id": "default"
-          }
-        },
-        {
-          "properties": {
-            "show": {
-              "expr": {
-                "Literal": {
-                  "Value": "true"
-                }
-              }
-            }
-          }
-        }
-      ],
-      "outline": [
-        {
-          "properties": {
-            "show": {
-              "expr": {
-                "Literal": {
-                  "Value": "false"
-                }
-              }
-            }
-          }
-        }
-      ]
-    },
-    "visualContainerObjects": {
-      "padding": [
-        {
-          "properties": {
-            "left": {
-              "expr": {
-                "Literal": {
-                  "Value": "10D"
-                }
-              }
-            },
-            "top": {
-              "expr": {
-                "Literal": {
-                  "Value": "10D"
-                }
-              }
-            },
-            "right": {
-              "expr": {
-                "Literal": {
-                  "Value": "0D"
-                }
-              }
-            },
-            "bottom": {
-              "expr": {
-                "Literal": {
-                  "Value": "0D"
-                }
-              }
-            }
-          }
-        }
-      ]
-    },
-    "drillFilterOtherVisuals": true
-  },
-  "howCreated": "InsertVisualButton"
-}
\ No newline at end of file
diff --git a/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/ef156f87dcc71228668b/visual.json b/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/ef156f87dcc71228668b/visual.json
new file mode 100644
index 0000000..137c55f
--- /dev/null
+++ b/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/ef156f87dcc71228668b/visual.json
@@ -0,0 +1,137 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
+  "name": "ef156f87dcc71228668b",
+  "position": {
+    "x": 301.02389078498294,
+    "y": 7.3720136518771335,
+    "z": 3001,
+    "height": 92.150170648464169,
+    "width": 969.41979522184306,
+    "tabOrder": 3001
+  },
+  "visual": {
+    "visualType": "textbox",
+    "objects": {
+      "general": [
+        {
+          "properties": {
+            "paragraphs": [
+              {
+                "textRuns": [
+                  {
+                    "value": "To apply filters to the data:",
+                    "textStyle": {
+                      "fontSize": "8pt"
+                    }
+                  }
+                ]
+              },
+              {
+                "textRuns": [
+                  {
+                    "value": ""
+                  }
+                ]
+              },
+              {
+                "textRuns": [
+                  {
+                    "value": "Click on the table",
+                    "textStyle": {
+                      "fontWeight": "bold",
+                      "fontSize": "8pt"
+                    }
+                  },
+                  {
+                    "value": " to activate it.",
+                    "textStyle": {
+                      "fontSize": "8pt"
+                    }
+                  }
+                ],
+                "listType": "ordered"
+              },
+              {
+                "textRuns": [
+                  {
+                    "value": "Use the ",
+                    "textStyle": {
+                      "fontSize": "8pt"
+                    }
+                  },
+                  {
+                    "value": "available filters",
+                    "textStyle": {
+                      "fontWeight": "bold",
+                      "fontSize": "8pt"
+                    }
+                  },
+                  {
+                    "value": " on the side panel or interact directly with the fields in the table.",
+                    "textStyle": {
+                      "fontSize": "8pt"
+                    }
+                  }
+                ],
+                "listType": "ordered"
+              },
+              {
+                "textRuns": [
+                  {
+                    "value": "💡 ",
+                    "textStyle": {
+                      "fontSize": "8pt"
+                    }
+                  },
+                  {
+                    "value": "Tip",
+                    "textStyle": {
+                      "fontWeight": "bold",
+                      "fontSize": "8pt"
+                    }
+                  },
+                  {
+                    "value": ": The export will reflect any filters that are applied. Make sure to set the filters first if you want to limit the exported data.",
+                    "textStyle": {
+                      "fontSize": "8pt"
+                    }
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      ]
+    },
+    "visualContainerObjects": {
+      "padding": [
+        {
+          "properties": {
+            "left": {
+              "expr": {
+                "Literal": {
+                  "Value": "10D"
+                }
+              }
+            },
+            "top": {
+              "expr": {
+                "Literal": {
+                  "Value": "10D"
+                }
+              }
+            },
+            "bottom": {
+              "expr": {
+                "Literal": {
+                  "Value": "0D"
+                }
+              }
+            }
+          }
+        }
+      ]
+    },
+    "drillFilterOtherVisuals": true
+  }
+}
\ No newline at end of file
diff --git a/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/faf83fa7b33a5b1006b3/visual.json b/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/faf83fa7b33a5b1006b3/visual.json
index eab9eba..670bb02 100644
--- a/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/faf83fa7b33a5b1006b3/visual.json
+++ b/CareTogether.Report/definition/pages/96791911d9aa80a413e8/visuals/faf83fa7b33a5b1006b3/visual.json
@@ -1,13 +1,13 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.0.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "faf83fa7b33a5b1006b3",
   "position": {
-    "x": 375.9726962457338,
-    "y": 9.829351535836178,
-    "z": 5000,
-    "height": 96.450511945392492,
-    "width": 894.47098976109214,
-    "tabOrder": 5000
+    "x": 10.443686006825939,
+    "y": 7.3720136518771335,
+    "z": 2000,
+    "height": 92.150170648464169,
+    "width": 630.30716723549483,
+    "tabOrder": 2000
   },
   "visual": {
     "visualType": "textbox",
@@ -19,7 +19,10 @@
               {
                 "textRuns": [
                   {
-                    "value": "TIP: "
+                    "value": "To export the data from this table:",
+                    "textStyle": {
+                      "fontSize": "8pt"
+                    }
                   }
                 ]
               },
@@ -33,25 +36,55 @@
               {
                 "textRuns": [
                   {
-                    "value": "To extract data from this table, right-click on it and select 'Export data'. You can download it as a CSV file for further analysis."
+                    "value": "Right-click",
+                    "textStyle": {
+                      "fontWeight": "bold",
+                      "fontSize": "8pt"
+                    }
+                  },
+                  {
+                    "value": " on the table visual.",
+                    "textStyle": {
+                      "fontSize": "8pt"
+                    }
                   }
                 ],
-                "listType": "bullet"
+                "listType": "ordered"
               },
               {
                 "textRuns": [
                   {
-                    "value": "To use the filters, first click on the table."
+                    "value": "Select ",
+                    "textStyle": {
+                      "fontSize": "8pt"
+                    }
+                  },
+                  {
+                    "value": "\"Export data\"",
+                    "textStyle": {
+                      "fontWeight": "bold",
+                      "fontSize": "8pt"
+                    }
+                  },
+                  {
+                    "value": ".",
+                    "textStyle": {
+                      "fontSize": "8pt"
+                    }
                   }
                 ],
-                "listType": "bullet"
+                "listType": "ordered"
               },
               {
                 "textRuns": [
                   {
-                    "value": ""
+                    "value": "Choose your preferred file format.",
+                    "textStyle": {
+                      "fontSize": "8pt"
+                    }
                   }
-                ]
+                ],
+                "listType": "ordered"
               }
             ]
           }
@@ -62,24 +95,140 @@
       "padding": [
         {
           "properties": {
-            "left": {
+            "top": {
               "expr": {
                 "Literal": {
-                  "Value": "20D"
+                  "Value": "10D"
                 }
               }
             },
-            "top": {
+            "bottom": {
+              "expr": {
+                "Literal": {
+                  "Value": "0D"
+                }
+              }
+            },
+            "left": {
               "expr": {
                 "Literal": {
                   "Value": "20D"
                 }
               }
+            }
+          }
+        }
+      ],
+      "title": [
+        {
+          "properties": {
+            "titleWrap": {
+              "expr": {
+                "Literal": {
+                  "Value": "true"
+                }
+              }
+            }
+          }
+        }
+      ],
+      "background": [
+        {
+          "properties": {
+            "show": {
+              "expr": {
+                "Literal": {
+                  "Value": "true"
+                }
+              }
             },
-            "bottom": {
+            "color": {
+              "solid": {
+                "color": {
+                  "expr": {
+                    "Literal": {
+                      "Value": "'#FFFFFF'"
+                    }
+                  }
+                }
+              }
+            },
+            "transparency": {
               "expr": {
                 "Literal": {
-                  "Value": "3D"
+                  "Value": "100D"
+                }
+              }
+            }
+          }
+        }
+      ],
+      "general": [
+        {
+          "properties": {
+            "keepLayerOrder": {
+              "expr": {
+                "Literal": {
+                  "Value": "true"
+                }
+              }
+            }
+          }
+        }
+      ],
+      "border": [
+        {
+          "properties": {
+            "width": {
+              "expr": {
+                "Literal": {
+                  "Value": "1D"
+                }
+              }
+            }
+          }
+        }
+      ],
+      "visualHeader": [
+        {
+          "properties": {
+            "show": {
+              "expr": {
+                "Literal": {
+                  "Value": "false"
+                }
+              }
+            },
+            "background": {
+              "solid": {
+                "color": {
+                  "expr": {
+                    "Literal": {
+                      "Value": "'#F6FCFC'"
+                    }
+                  }
+                }
+              }
+            },
+            "border": {
+              "solid": {
+                "color": {
+                  "expr": {
+                    "Literal": {
+                      "Value": "'#EFEFEF'"
+                    }
+                  }
+                }
+              }
+            },
+            "foreground": {
+              "solid": {
+                "color": {
+                  "expr": {
+                    "Literal": {
+                      "Value": "'#26A3AB'"
+                    }
+                  }
                 }
               }
             }
diff --git a/CareTogether.Report/definition/pages/ReportSectiondde1dd56e86a6be0bd57/page.json b/CareTogether.Report/definition/pages/ReportSectiondde1dd56e86a6be0bd57/page.json
index 5421fc4..f742f94 100644
--- a/CareTogether.Report/definition/pages/ReportSectiondde1dd56e86a6be0bd57/page.json
+++ b/CareTogether.Report/definition/pages/ReportSectiondde1dd56e86a6be0bd57/page.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/1.3.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.0.0/schema.json",
   "name": "ReportSectiondde1dd56e86a6be0bd57",
   "displayName": "Approvals History - REVAMP",
   "displayOption": "FitToPage",
diff --git a/CareTogether.Report/definition/pages/ReportSectiondde1dd56e86a6be0bd57/visuals/1a9f70107748c43e6d5a/visual.json b/CareTogether.Report/definition/pages/ReportSectiondde1dd56e86a6be0bd57/visuals/1a9f70107748c43e6d5a/visual.json
index 73d9691..ff00874 100644
--- a/CareTogether.Report/definition/pages/ReportSectiondde1dd56e86a6be0bd57/visuals/1a9f70107748c43e6d5a/visual.json
+++ b/CareTogether.Report/definition/pages/ReportSectiondde1dd56e86a6be0bd57/visuals/1a9f70107748c43e6d5a/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "1a9f70107748c43e6d5a",
   "position": {
     "x": 343.14068759599166,
diff --git a/CareTogether.Report/definition/pages/ReportSectiondde1dd56e86a6be0bd57/visuals/801c0202503aa54bc92c/visual.json b/CareTogether.Report/definition/pages/ReportSectiondde1dd56e86a6be0bd57/visuals/801c0202503aa54bc92c/visual.json
index 6945c8d..c024d44 100644
--- a/CareTogether.Report/definition/pages/ReportSectiondde1dd56e86a6be0bd57/visuals/801c0202503aa54bc92c/visual.json
+++ b/CareTogether.Report/definition/pages/ReportSectiondde1dd56e86a6be0bd57/visuals/801c0202503aa54bc92c/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "801c0202503aa54bc92c",
   "position": {
     "x": 12.317870836779189,
diff --git a/CareTogether.Report/definition/pages/ReportSectiondde1dd56e86a6be0bd57/visuals/a0cacbca0bcc039a7012/visual.json b/CareTogether.Report/definition/pages/ReportSectiondde1dd56e86a6be0bd57/visuals/a0cacbca0bcc039a7012/visual.json
index 390197e..d1828e6 100644
--- a/CareTogether.Report/definition/pages/ReportSectiondde1dd56e86a6be0bd57/visuals/a0cacbca0bcc039a7012/visual.json
+++ b/CareTogether.Report/definition/pages/ReportSectiondde1dd56e86a6be0bd57/visuals/a0cacbca0bcc039a7012/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "a0cacbca0bcc039a7012",
   "position": {
     "x": 12.317870836779189,
diff --git a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/page.json b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/page.json
index 1e35955..39b02e6 100644
--- a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/page.json
+++ b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/page.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/1.4.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.0.0/schema.json",
   "name": "b86606d8cc618ca89105",
   "displayName": "Approvals",
   "displayOption": "FitToPage",
diff --git a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/1e2a99279bb0b89ed0b0/visual.json b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/1e2a99279bb0b89ed0b0/visual.json
index ec616fe..90da0d5 100644
--- a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/1e2a99279bb0b89ed0b0/visual.json
+++ b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/1e2a99279bb0b89ed0b0/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "1e2a99279bb0b89ed0b0",
   "position": {
     "x": 10.443686006825939,
diff --git a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/22e8ef871416b0b7010b/visual.json b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/22e8ef871416b0b7010b/visual.json
index 205afa7..48b0a6f 100644
--- a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/22e8ef871416b0b7010b/visual.json
+++ b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/22e8ef871416b0b7010b/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "22e8ef871416b0b7010b",
   "position": {
     "x": 10.443686006825939,
diff --git a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/24c9e617e3e12e2c9e96/visual.json b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/24c9e617e3e12e2c9e96/visual.json
index 9bcec63..cdfa2f2 100644
--- a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/24c9e617e3e12e2c9e96/visual.json
+++ b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/24c9e617e3e12e2c9e96/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "24c9e617e3e12e2c9e96",
   "position": {
     "x": 729.82935153583617,
diff --git a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/2f134ae1940c41b403b9/visual.json b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/2f134ae1940c41b403b9/visual.json
index 521c331..b6332fe 100644
--- a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/2f134ae1940c41b403b9/visual.json
+++ b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/2f134ae1940c41b403b9/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.0.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "2f134ae1940c41b403b9",
   "position": {
     "x": 739.65870307167233,
@@ -580,93 +580,5 @@
       ]
     },
     "drillFilterOtherVisuals": true
-  },
-  "filterConfig": {
-    "filters": [
-      {
-        "name": "a55e91f10a7c8e6c04a3",
-        "field": {
-          "Measure": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Approvals by Entity"
-              }
-            },
-            "Property": "Dynamic Entity Name (Approvals)"
-          }
-        },
-        "type": "Advanced"
-      },
-      {
-        "name": "d441430c30173df3e8ff",
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Role"
-              }
-            },
-            "Property": "Role Name"
-          }
-        },
-        "type": "Categorical"
-      },
-      {
-        "name": "34d252d281456de5195c",
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Approval Status"
-              }
-            },
-            "Property": "Status"
-          }
-        },
-        "type": "Categorical"
-      },
-      {
-        "name": "81d7653ee6b9ef392d44",
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Role Approval"
-              }
-            },
-            "Property": "Approval Type"
-          }
-        },
-        "type": "Categorical"
-      },
-      {
-        "name": "89de4a93437b8d29729e",
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Role Approval"
-              }
-            },
-            "Property": "Entity Id"
-          }
-        },
-        "type": "Categorical"
-      },
-      {
-        "name": "24ded3a5783b31f72f97",
-        "field": {
-          "Measure": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Entity"
-              }
-            },
-            "Property": "# of Entities in Role"
-          }
-        },
-        "type": "Advanced"
-      }
-    ]
   }
 }
\ No newline at end of file
diff --git a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/35827769b103ba2481c0/visual.json b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/35827769b103ba2481c0/visual.json
index f68ab9b..54b8a7f 100644
--- a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/35827769b103ba2481c0/visual.json
+++ b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/35827769b103ba2481c0/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "35827769b103ba2481c0",
   "position": {
     "x": 0,
diff --git a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/3fdcbe5517eb24280a1c/visual.json b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/3fdcbe5517eb24280a1c/visual.json
index d3db4f6..6cc5c77 100644
--- a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/3fdcbe5517eb24280a1c/visual.json
+++ b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/3fdcbe5517eb24280a1c/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "3fdcbe5517eb24280a1c",
   "position": {
     "x": 369.82935153583617,
diff --git a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/64387f4f4302e0c790e3/visual.json b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/64387f4f4302e0c790e3/visual.json
index 72fb46b..b897dfa 100644
--- a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/64387f4f4302e0c790e3/visual.json
+++ b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/64387f4f4302e0c790e3/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "64387f4f4302e0c790e3",
   "position": {
     "x": 0,
diff --git a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/da5bce60a42d0b920e30/visual.json b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/da5bce60a42d0b920e30/visual.json
index 2844b18..c30f6ca 100644
--- a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/da5bce60a42d0b920e30/visual.json
+++ b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/da5bce60a42d0b920e30/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "da5bce60a42d0b920e30",
   "position": {
     "x": 739.65870307167233,
diff --git a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/db179545061c8d04967d/visual.json b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/db179545061c8d04967d/visual.json
index 0bfea0e..d74cba8 100644
--- a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/db179545061c8d04967d/visual.json
+++ b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/db179545061c8d04967d/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.0.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "db179545061c8d04967d",
   "position": {
     "x": 10.443686006825939,
@@ -382,23 +382,5 @@
       "filterChanges": true
     },
     "drillFilterOtherVisuals": true
-  },
-  "filterConfig": {
-    "filters": [
-      {
-        "name": "6fba59ee8ef2dd15a275",
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Approvals by Entity"
-              }
-            },
-            "Property": "Entity Type"
-          }
-        },
-        "type": "Categorical"
-      }
-    ]
   }
 }
\ No newline at end of file
diff --git a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/e9bea440c0490c607761/visual.json b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/e9bea440c0490c607761/visual.json
index 4543d24..15d4c12 100644
--- a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/e9bea440c0490c607761/visual.json
+++ b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/e9bea440c0490c607761/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "e9bea440c0490c607761",
   "position": {
     "x": 729.33333333333337,
diff --git a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/f34af2cd1d505c780ad0/visual.json b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/f34af2cd1d505c780ad0/visual.json
index 3cfeb4f..9be296e 100644
--- a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/f34af2cd1d505c780ad0/visual.json
+++ b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/f34af2cd1d505c780ad0/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "f34af2cd1d505c780ad0",
   "position": {
     "x": 364.91467576791808,
diff --git a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/f3ff926f810aa40a71b7/visual.json b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/f3ff926f810aa40a71b7/visual.json
index 8c71a93..7b839d7 100644
--- a/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/f3ff926f810aa40a71b7/visual.json
+++ b/CareTogether.Report/definition/pages/b86606d8cc618ca89105/visuals/f3ff926f810aa40a71b7/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "f3ff926f810aa40a71b7",
   "position": {
     "x": 0,
diff --git a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/page.json b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/page.json
index 9fc836a..b11fe19 100644
--- a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/page.json
+++ b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/page.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/1.4.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.0.0/schema.json",
   "name": "d08ff20b71001be16c90",
   "displayName": "Impact",
   "displayOption": "FitToPage",
diff --git a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/177d33ba163573002323/visual.json b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/177d33ba163573002323/visual.json
index dc15f81..47f7ee6 100644
--- a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/177d33ba163573002323/visual.json
+++ b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/177d33ba163573002323/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "177d33ba163573002323",
   "position": {
     "x": 837.14285714285722,
diff --git a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/197c3aad6a9c6e7ca65b/visual.json b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/197c3aad6a9c6e7ca65b/visual.json
index 9b8a2c3..d166a16 100644
--- a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/197c3aad6a9c6e7ca65b/visual.json
+++ b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/197c3aad6a9c6e7ca65b/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "197c3aad6a9c6e7ca65b",
   "position": {
     "x": 382.14285714285717,
diff --git a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/30fe6cf32cbc267e34a6/visual.json b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/30fe6cf32cbc267e34a6/visual.json
index 7cf93f9..037e11d 100644
--- a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/30fe6cf32cbc267e34a6/visual.json
+++ b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/30fe6cf32cbc267e34a6/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "30fe6cf32cbc267e34a6",
   "position": {
     "x": 374.74402730375425,
diff --git a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/4736b559dc9108b497b9/visual.json b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/4736b559dc9108b497b9/visual.json
index b41e4ad..71a6060 100644
--- a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/4736b559dc9108b497b9/visual.json
+++ b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/4736b559dc9108b497b9/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "4736b559dc9108b497b9",
   "position": {
     "x": 10,
diff --git a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/5ff6a927d2b0b7645496/visual.json b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/5ff6a927d2b0b7645496/visual.json
index 0644f15..69ed027 100644
--- a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/5ff6a927d2b0b7645496/visual.json
+++ b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/5ff6a927d2b0b7645496/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "5ff6a927d2b0b7645496",
   "position": {
     "x": 0,
diff --git a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/669f4ccc6ce3c31d589a/visual.json b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/669f4ccc6ce3c31d589a/visual.json
index a0af609..1093096 100644
--- a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/669f4ccc6ce3c31d589a/visual.json
+++ b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/669f4ccc6ce3c31d589a/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "669f4ccc6ce3c31d589a",
   "position": {
     "x": 375,
diff --git a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/793b3f7e0027ae3c6647/visual.json b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/793b3f7e0027ae3c6647/visual.json
index 860755d..63ab75f 100644
--- a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/793b3f7e0027ae3c6647/visual.json
+++ b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/793b3f7e0027ae3c6647/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "793b3f7e0027ae3c6647",
   "position": {
     "x": 837.14285714285722,
diff --git a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/828858e1023d822a737d/visual.json b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/828858e1023d822a737d/visual.json
index 9b3325d..7fb5b52 100644
--- a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/828858e1023d822a737d/visual.json
+++ b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/828858e1023d822a737d/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.0.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "828858e1023d822a737d",
   "position": {
     "x": 382.14285714285717,
@@ -719,65 +719,5 @@
       ]
     },
     "drillFilterOtherVisuals": true
-  },
-  "filterConfig": {
-    "filters": [
-      {
-        "name": "4acb5336be1409e0bc08",
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Date"
-              }
-            },
-            "Property": "Year"
-          }
-        },
-        "type": "Advanced"
-      },
-      {
-        "name": "11c905633e2c199e6c82",
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Date"
-              }
-            },
-            "Property": "Month Name Short"
-          }
-        },
-        "type": "Categorical"
-      },
-      {
-        "name": "533d1f513baa07cca1ad",
-        "field": {
-          "Column": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Location"
-              }
-            },
-            "Property": "Location"
-          }
-        },
-        "type": "Categorical"
-      },
-      {
-        "name": "44d162dc427d3e43a400",
-        "field": {
-          "Measure": {
-            "Expression": {
-              "SourceRef": {
-                "Entity": "Entity"
-              }
-            },
-            "Property": "# of Children Cared For"
-          }
-        },
-        "type": "Advanced"
-      }
-    ]
   }
 }
\ No newline at end of file
diff --git a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/93f18b71a0447bbd9018/visual.json b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/93f18b71a0447bbd9018/visual.json
index 475b046..ceb2f1e 100644
--- a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/93f18b71a0447bbd9018/visual.json
+++ b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/93f18b71a0447bbd9018/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "93f18b71a0447bbd9018",
   "position": {
     "x": 0,
diff --git a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/9c4ee39ac067a0ed9785/visual.json b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/9c4ee39ac067a0ed9785/visual.json
index 0ce26d6..a70037f 100644
--- a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/9c4ee39ac067a0ed9785/visual.json
+++ b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/9c4ee39ac067a0ed9785/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "9c4ee39ac067a0ed9785",
   "position": {
     "x": 375,
diff --git a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/9f8fd0b22c3917eaa741/visual.json b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/9f8fd0b22c3917eaa741/visual.json
index 2f10a42..5e32a6d 100644
--- a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/9f8fd0b22c3917eaa741/visual.json
+++ b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/9f8fd0b22c3917eaa741/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "9f8fd0b22c3917eaa741",
   "position": {
     "x": 382.11604095563138,
diff --git a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/a20737a507bae877b71b/visual.json b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/a20737a507bae877b71b/visual.json
index 6ced078..154107b 100644
--- a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/a20737a507bae877b71b/visual.json
+++ b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/a20737a507bae877b71b/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "a20737a507bae877b71b",
   "position": {
     "x": 830.27027027027032,
diff --git a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/a410384e950ea6b12edb/visual.json b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/a410384e950ea6b12edb/visual.json
index f555958..987a57e 100644
--- a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/a410384e950ea6b12edb/visual.json
+++ b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/a410384e950ea6b12edb/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "a410384e950ea6b12edb",
   "position": {
     "x": 837.14285714285722,
diff --git a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/ad9d5cba41e396de2df0/visual.json b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/ad9d5cba41e396de2df0/visual.json
index e85d6aa..fc8a386 100644
--- a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/ad9d5cba41e396de2df0/visual.json
+++ b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/ad9d5cba41e396de2df0/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "ad9d5cba41e396de2df0",
   "position": {
     "x": 837.33788395904435,
diff --git a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/b0ecd5ecc59902ac0600/visual.json b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/b0ecd5ecc59902ac0600/visual.json
index 5c121d3..9330e52 100644
--- a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/b0ecd5ecc59902ac0600/visual.json
+++ b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/b0ecd5ecc59902ac0600/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "b0ecd5ecc59902ac0600",
   "position": {
     "x": 837.33788395904435,
diff --git a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/bd5ed31c96451c589453/visual.json b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/bd5ed31c96451c589453/visual.json
index 0fdd3a4..08b0033 100644
--- a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/bd5ed31c96451c589453/visual.json
+++ b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/bd5ed31c96451c589453/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "bd5ed31c96451c589453",
   "position": {
     "x": 837.14285714285722,
diff --git a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/c723db5a181300c28a00/visual.json b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/c723db5a181300c28a00/visual.json
index 4163e2e..fb21f97 100644
--- a/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/c723db5a181300c28a00/visual.json
+++ b/CareTogether.Report/definition/pages/d08ff20b71001be16c90/visuals/c723db5a181300c28a00/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "c723db5a181300c28a00",
   "position": {
     "x": 10,
diff --git a/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/page.json b/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/page.json
index 4071ea4..89f1c37 100644
--- a/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/page.json
+++ b/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/page.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/1.3.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.0.0/schema.json",
   "name": "e3e436ecd75be754ee24",
   "displayName": "Arrangement Duration - DEMO",
   "displayOption": "FitToPage",
diff --git a/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/102e5fff60027558bb9c/visual.json b/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/102e5fff60027558bb9c/visual.json
index f37fc89..503e91f 100644
--- a/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/102e5fff60027558bb9c/visual.json
+++ b/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/102e5fff60027558bb9c/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "102e5fff60027558bb9c",
   "position": {
     "x": 966.80851063829789,
diff --git a/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/39c7019c3964ad96b2eb/visual.json b/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/39c7019c3964ad96b2eb/visual.json
index 2bb311a..acf22d0 100644
--- a/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/39c7019c3964ad96b2eb/visual.json
+++ b/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/39c7019c3964ad96b2eb/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "39c7019c3964ad96b2eb",
   "position": {
     "x": 640,
diff --git a/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/5c93a7d12c48300d37ba/visual.json b/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/5c93a7d12c48300d37ba/visual.json
index d8e04f8..2b08cdd 100644
--- a/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/5c93a7d12c48300d37ba/visual.json
+++ b/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/5c93a7d12c48300d37ba/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "5c93a7d12c48300d37ba",
   "position": {
     "x": 0,
diff --git a/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/7f06a782a84c34eb06ed/visual.json b/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/7f06a782a84c34eb06ed/visual.json
index a3f7d25..04bbd5f 100644
--- a/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/7f06a782a84c34eb06ed/visual.json
+++ b/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/7f06a782a84c34eb06ed/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "7f06a782a84c34eb06ed",
   "position": {
     "x": 960,
diff --git a/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/d13a15afde956a6c22d2/visual.json b/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/d13a15afde956a6c22d2/visual.json
index 6ee4f1d..23839b5 100644
--- a/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/d13a15afde956a6c22d2/visual.json
+++ b/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/d13a15afde956a6c22d2/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "d13a15afde956a6c22d2",
   "position": {
     "x": 0,
diff --git a/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/de1ebc4171633c7d2500/visual.json b/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/de1ebc4171633c7d2500/visual.json
index c6af1a3..4a95898 100644
--- a/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/de1ebc4171633c7d2500/visual.json
+++ b/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/de1ebc4171633c7d2500/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "de1ebc4171633c7d2500",
   "position": {
     "x": 966.80851063829789,
diff --git a/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/dfadc8622ed69eb9d508/visual.json b/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/dfadc8622ed69eb9d508/visual.json
index 5d55031..6bf3849 100644
--- a/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/dfadc8622ed69eb9d508/visual.json
+++ b/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/dfadc8622ed69eb9d508/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "dfadc8622ed69eb9d508",
   "position": {
     "x": 320,
diff --git a/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/f65bc58f36a37cc2c796/visual.json b/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/f65bc58f36a37cc2c796/visual.json
index 7d3a0df..ec762fc 100644
--- a/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/f65bc58f36a37cc2c796/visual.json
+++ b/CareTogether.Report/definition/pages/e3e436ecd75be754ee24/visuals/f65bc58f36a37cc2c796/visual.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/1.7.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.1.0/schema.json",
   "name": "f65bc58f36a37cc2c796",
   "position": {
     "x": 0,
diff --git a/CareTogether.Report/definition/pages/pages.json b/CareTogether.Report/definition/pages/pages.json
index 69d95c0..7f15b7f 100644
--- a/CareTogether.Report/definition/pages/pages.json
+++ b/CareTogether.Report/definition/pages/pages.json
@@ -13,5 +13,5 @@
     "ReportSectiondde1dd56e86a6be0bd57",
     "e3e436ecd75be754ee24"
   ],
-  "activePageName": "d08ff20b71001be16c90"
+  "activePageName": "96791911d9aa80a413e8"
 }
\ No newline at end of file
diff --git a/CareTogether.Report/definition/report.json b/CareTogether.Report/definition/report.json
index aa17a04..1916cdb 100644
--- a/CareTogether.Report/definition/report.json
+++ b/CareTogether.Report/definition/report.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/report/1.3.0/schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/report/2.1.0/schema.json",
   "themeCollection": {
     "baseTheme": {
       "name": "CY24SU10",
@@ -12,7 +12,6 @@
       "type": "RegisteredResources"
     }
   },
-  "layoutOptimization": "None",
   "filterConfig": {
     "filters": [
       {
diff --git a/CareTogether.SemanticModel/definition/cultures/en-US.tmdl b/CareTogether.SemanticModel/definition/cultures/en-US.tmdl
index 52d2c66..ab2aba1 100644
--- a/CareTogether.SemanticModel/definition/cultures/en-US.tmdl
+++ b/CareTogether.SemanticModel/definition/cultures/en-US.tmdl
@@ -13910,32 +13910,6 @@ cultureInfo en-US
 			      ],
 			      "SemanticType": "Time"
 			    },
-			    "export_contacts.dynamic_entity_name_approval": {
-			      "Definition": {
-			        "Binding": {
-			          "ConceptualEntity": "Export Contacts",
-			          "ConceptualProperty": "Dynamic Entity Name (Approval)"
-			        }
-			      },
-			      "State": "Generated",
-			      "Terms": [
-			        {
-			          "dynamic entity name (approval)": {
-			            "State": "Generated"
-			          }
-			        },
-			        {
-			          "Name": {
-			            "State": "Suggested",
-			            "Source": {
-			              "Type": "External",
-			              "Agent": "PowerBI.VisualColumnRename"
-			            },
-			            "Weight": 0.9
-			          }
-			        }
-			      ]
-			    },
 			    "entity.full_name": {
 			      "Definition": {
 			        "Binding": {
@@ -14049,6 +14023,16 @@ cultureInfo en-US
 			            },
 			            "Weight": 0.9
 			          }
+			        },
+			        {
+			          "Person Name": {
+			            "State": "Suggested",
+			            "Source": {
+			              "Type": "External",
+			              "Agent": "PowerBI.VisualColumnRename"
+			            },
+			            "Weight": 0.9
+			          }
 			        }
 			      ],
 			      "NameType": "Name"
@@ -19574,290 +19558,6 @@ cultureInfo en-US
 			        }
 			      ]
 			    },
-			    "export_contact": {
-			      "Definition": {
-			        "Binding": {
-			          "ConceptualEntity": "Export Contacts"
-			        }
-			      },
-			      "State": "Generated",
-			      "Terms": [
-			        {
-			          "export contact": {
-			            "State": "Generated"
-			          }
-			        },
-			        {
-			          "contact": {
-			            "State": "Generated",
-			            "Weight": 0.97
-			          }
-			        },
-			        {
-			          "export connection": {
-			            "Type": "Noun",
-			            "State": "Suggested",
-			            "Source": {
-			              "Agent": "Thesaurus"
-			            },
-			            "Weight": 0.75
-			          }
-			        },
-			        {
-			          "export interaction": {
-			            "Type": "Noun",
-			            "State": "Suggested",
-			            "Source": {
-			              "Agent": "Thesaurus"
-			            },
-			            "Weight": 0.75
-			          }
-			        },
-			        {
-			          "connection": {
-			            "Type": "Noun",
-			            "State": "Suggested",
-			            "Source": {
-			              "Agent": "Thesaurus"
-			            },
-			            "Weight": 0.736
-			          }
-			        },
-			        {
-			          "interaction": {
-			            "Type": "Noun",
-			            "State": "Suggested",
-			            "Source": {
-			              "Agent": "Thesaurus"
-			            },
-			            "Weight": 0.736
-			          }
-			        },
-			        {
-			          "export phone": {
-			            "Type": "Noun",
-			            "State": "Suggested",
-			            "Source": {
-			              "Agent": "Thesaurus"
-			            },
-			            "Weight": 0.727
-			          }
-			        },
-			        {
-			          "export telephone": {
-			            "Type": "Noun",
-			            "State": "Suggested",
-			            "Source": {
-			              "Agent": "Thesaurus"
-			            },
-			            "Weight": 0.727
-			          }
-			        },
-			        {
-			          "export communication": {
-			            "Type": "Noun",
-			            "State": "Suggested",
-			            "Source": {
-			              "Agent": "Thesaurus"
-			            },
-			            "Weight": 0.727
-			          }
-			        },
-			        {
-			          "export e-mail": {
-			            "Type": "Noun",
-			            "State": "Suggested",
-			            "Source": {
-			              "Agent": "Thesaurus"
-			            },
-			            "Weight": 0.727
-			          }
-			        },
-			        {
-			          "export link": {
-			            "Type": "Noun",
-			            "State": "Suggested",
-			            "Source": {
-			              "Agent": "Thesaurus"
-			            },
-			            "Weight": 0.727
-			          }
-			        },
-			        {
-			          "export reach": {
-			            "Type": "Noun",
-			            "State": "Suggested",
-			            "Source": {
-			              "Agent": "Thesaurus"
-			            },
-			            "Weight": 0.727
-			          }
-			        }
-			      ]
-			    },
-			    "export_contact.entity_type": {
-			      "Definition": {
-			        "Binding": {
-			          "ConceptualEntity": "Export Contacts",
-			          "ConceptualProperty": "Entity Type"
-			        }
-			      },
-			      "State": "Generated",
-			      "Terms": [
-			        {
-			          "entity type": {
-			            "State": "Generated"
-			          }
-			        },
-			        {
-			          "type": {
-			            "State": "Generated",
-			            "Weight": 0.97
-			          }
-			        },
-			        {
-			          "entity category": {
-			            "Type": "Noun",
-			            "State": "Suggested",
-			            "Source": {
-			              "Agent": "Thesaurus"
-			            },
-			            "Weight": 0.75
-			          }
-			        },
-			        {
-			          "entity genre": {
-			            "Type": "Noun",
-			            "State": "Suggested",
-			            "Source": {
-			              "Agent": "Thesaurus"
-			            },
-			            "Weight": 0.75
-			          }
-			        },
-			        {
-			          "entity manner": {
-			            "Type": "Noun",
-			            "State": "Suggested",
-			            "Source": {
-			              "Agent": "Thesaurus"
-			            },
-			            "Weight": 0.75
-			          }
-			        },
-			        {
-			          "entity variety": {
-			            "Type": "Noun",
-			            "State": "Suggested",
-			            "Source": {
-			              "Agent": "Thesaurus"
-			            },
-			            "Weight": 0.75
-			          }
-			        },
-			        {
-			          "category": {
-			            "Type": "Noun",
-			            "State": "Suggested",
-			            "Source": {
-			              "Agent": "Thesaurus"
-			            },
-			            "Weight": 0.736
-			          }
-			        },
-			        {
-			          "genre": {
-			            "Type": "Noun",
-			            "State": "Suggested",
-			            "Source": {
-			              "Agent": "Thesaurus"
-			            },
-			            "Weight": 0.736
-			          }
-			        },
-			        {
-			          "manner": {
-			            "Type": "Noun",
-			            "State": "Suggested",
-			            "Source": {
-			              "Agent": "Thesaurus"
-			            },
-			            "Weight": 0.736
-			          }
-			        },
-			        {
-			          "variety": {
-			            "Type": "Noun",
-			            "State": "Suggested",
-			            "Source": {
-			              "Agent": "Thesaurus"
-			            },
-			            "Weight": 0.736
-			          }
-			        },
-			        {
-			          "entity brand": {
-			            "Type": "Noun",
-			            "State": "Suggested",
-			            "Source": {
-			              "Agent": "Thesaurus"
-			            },
-			            "Weight": 0.727
-			          }
-			        },
-			        {
-			          "entity class": {
-			            "Type": "Noun",
-			            "State": "Suggested",
-			            "Source": {
-			              "Agent": "Thesaurus"
-			            },
-			            "Weight": 0.727
-			          }
-			        }
-			      ]
-			    },
-			    "export_contact.ordinal": {
-			      "Definition": {
-			        "Binding": {
-			          "ConceptualEntity": "Export Contacts",
-			          "ConceptualProperty": "Ordinal"
-			        }
-			      },
-			      "State": "Generated",
-			      "Visibility": {
-			        "Value": "Hidden"
-			      },
-			      "Terms": [
-			        {
-			          "ordinal": {
-			            "State": "Generated"
-			          }
-			        }
-			      ]
-			    },
-			    "export_contact.referential_ids": {
-			      "Definition": {
-			        "Binding": {
-			          "ConceptualEntity": "Export Contacts",
-			          "ConceptualProperty": "Referential Ids"
-			        }
-			      },
-			      "State": "Generated",
-			      "Terms": [
-			        {
-			          "referential ids": {
-			            "State": "Generated"
-			          }
-			        },
-			        {
-			          "ids": {
-			            "State": "Generated",
-			            "Weight": 0.97
-			          }
-			        }
-			      ]
-			    },
 			    "arrangement_by_entity": {
 			      "Definition": {
 			        "Binding": {
@@ -23373,42 +23073,51 @@ cultureInfo en-US
 			          }
 			        }
 			      ]
-			    }
-			  },
-			  "Relationships": {
-			    "export_contact_has_entity_type": {
-			      "Binding": {
-			        "ConceptualEntity": "Export Contacts"
+			    },
+			    "role_approval.volunteer_family_status_flag": {
+			      "Definition": {
+			        "Binding": {
+			          "ConceptualEntity": "Role Approval",
+			          "ConceptualProperty": "Volunteer Family Status Flag"
+			        }
 			      },
 			      "State": "Generated",
-			      "Roles": {
-			        "export_contact": {
-			          "Target": {
-			            "Entity": "export_contact"
-			          }
-			        },
-			        "export_contact.entity_type": {
-			          "Target": {
-			            "Entity": "export_contact.entity_type"
+			      "Terms": [
+			        {
+			          "Family Status": {
+			            "State": "Suggested",
+			            "Source": {
+			              "Type": "External",
+			              "Agent": "PowerBI.VisualColumnRename"
+			            },
+			            "Weight": 0.9
 			          }
 			        }
+			      ]
+			    },
+			    "role_approval.volunteer_individual_status_flag": {
+			      "Definition": {
+			        "Binding": {
+			          "ConceptualEntity": "Role Approval",
+			          "ConceptualProperty": "Volunteer Individual Status Flag"
+			        }
 			      },
-			      "Phrasings": [
+			      "State": "Generated",
+			      "Terms": [
 			        {
-			          "Attribute": {
-			            "Subject": {
-			              "Role": "export_contact"
+			          "Person Status": {
+			            "State": "Suggested",
+			            "Source": {
+			              "Type": "External",
+			              "Agent": "PowerBI.VisualColumnRename"
 			            },
-			            "Object": {
-			              "Role": "export_contact.entity_type"
-			            }
-			          },
-			          "State": "Generated",
-			          "Weight": 0.99,
-			          "ID": "export_contacts_have_entity_types"
+			            "Weight": 0.9
+			          }
 			        }
 			      ]
-			    },
+			    }
+			  },
+			  "Relationships": {
 			    "engagement_by_entity_has_approved_entities_dynamic_title": {
 			      "Binding": {
 			        "ConceptualEntity": "Engagement by Entity"
@@ -25164,39 +24873,6 @@ cultureInfo en-US
 			        }
 			      ]
 			    },
-			    "export_contact_has_export_contacts_dynamic_entity_name_approval": {
-			      "Binding": {
-			        "ConceptualEntity": "Export Contacts"
-			      },
-			      "State": "Generated",
-			      "Roles": {
-			        "export_contact": {
-			          "Target": {
-			            "Entity": "export_contact"
-			          }
-			        },
-			        "export_contacts.dynamic_entity_name_approval": {
-			          "Target": {
-			            "Entity": "export_contacts.dynamic_entity_name_approval"
-			          }
-			        }
-			      },
-			      "Phrasings": [
-			        {
-			          "Attribute": {
-			            "Subject": {
-			              "Role": "export_contact"
-			            },
-			            "Object": {
-			              "Role": "export_contacts.dynamic_entity_name_approval"
-			            }
-			          },
-			          "State": "Generated",
-			          "Weight": 0.99,
-			          "ID": "export_contacts_have_dynamic_entity_name_approval"
-			        }
-			      ]
-			    },
 			    "entity_has_entity_last_assignment_date": {
 			      "Binding": {
 			        "ConceptualEntity": "Entity"
@@ -29575,39 +29251,6 @@ cultureInfo en-US
 			        }
 			      ]
 			    },
-			    "export_contact_has_referential_ids": {
-			      "Binding": {
-			        "ConceptualEntity": "Export Contacts"
-			      },
-			      "State": "Generated",
-			      "Roles": {
-			        "export_contact": {
-			          "Target": {
-			            "Entity": "export_contact"
-			          }
-			        },
-			        "export_contact.referential_ids": {
-			          "Target": {
-			            "Entity": "export_contact.referential_ids"
-			          }
-			        }
-			      },
-			      "Phrasings": [
-			        {
-			          "Attribute": {
-			            "Subject": {
-			              "Role": "export_contact"
-			            },
-			            "Object": {
-			              "Role": "export_contact.referential_ids"
-			            }
-			          },
-			          "State": "Generated",
-			          "Weight": 0.99,
-			          "ID": "export_contacts_have_referential_ids"
-			        }
-			      ]
-			    },
 			    "arrangement_by_entity_has_situation": {
 			      "Binding": {
 			        "ConceptualEntity": "Arrangements by Entity"
diff --git a/CareTogether.SemanticModel/definition/model.tmdl b/CareTogether.SemanticModel/definition/model.tmdl
index c1040f4..b798d51 100644
--- a/CareTogether.SemanticModel/definition/model.tmdl
+++ b/CareTogether.SemanticModel/definition/model.tmdl
@@ -33,7 +33,7 @@ annotation PBI_QueryOrder = ["Community","Role","OData Live","Production","Refer
 
 annotation __PBI_TimeIntelligenceEnabled = 1
 
-annotation PBIDesktopVersion = 2.143.1204.0 (25.05)+23c84aace645781dd62b8a26eb0418c7e6a84b72
+annotation PBIDesktopVersion = 2.144.1155.0 (25.06)+46435b07013d2a234d7fd007083a9e70b8e79f1c
 
 annotation PBI_ProTooling = ["CalcGroup","DevMode","DaxQueryView_Desktop"]
 
@@ -66,7 +66,6 @@ ref table LocalDateTable_de2c3251-3f42-4917-b1a3-c8994b5b4a55
 ref table 'Role Approval'
 ref table 'Approvals by Entity'
 ref table 'Engagement by Entity'
-ref table 'Export Contacts'
 ref table 'Arrangements by Entity'
 ref table 'RLS Location User - Approvals'
 ref table 'RLS Location User - Arrangements'
diff --git a/CareTogether.SemanticModel/definition/tables/Export Contacts.tmdl b/CareTogether.SemanticModel/definition/tables/Export Contacts.tmdl
deleted file mode 100644
index d8e02cc..0000000
--- a/CareTogether.SemanticModel/definition/tables/Export Contacts.tmdl	
+++ /dev/null
@@ -1,48 +0,0 @@
-table 'Export Contacts'
-	lineageTag: 60ba141e-f35f-47f1-89c6-55e30f55efa7
-
-	calculationGroup
-		precedence: 2
-
-		calculationItem Family = SELECTEDMEASURE()
-
-		calculationItem Person = SELECTEDMEASURE()
-
-	measure 'Dynamic Entity Name (Approval)' =
-			
-			VAR Option = SELECTEDVALUE('Export Contacts'[Entity Type])
-			RETURN SWITCH(
-			    Option,
-			    "Family", SELECTEDVALUE(Entity[Family Name]),
-			    "Person", SELECTEDVALUE(Entity[Full Name])
-			)
-		lineageTag: 6c40a732-8d76-4585-9c81-e048bb92f87c
-
-	measure 'Referential Ids' =
-			
-			UNION(
-			    SELECTCOLUMNS(Entity, "ID", Entity[FamilyId]),
-			    SELECTCOLUMNS(Entity, "ID", Entity[PersonId])
-			)
-		lineageTag: ca26b563-c520-479c-b38b-a47032d38546
-
-		annotation PBI_FormatHint = {"isGeneralNumber":true}
-
-	column 'Entity Type'
-		dataType: string
-		lineageTag: 798b8350-7e72-4ba1-bf35-9e3fce0f55d7
-		summarizeBy: none
-		sourceColumn: Name
-		sortByColumn: Ordinal
-
-		annotation SummarizationSetBy = Automatic
-
-	column Ordinal
-		dataType: int64
-		isHidden
-		lineageTag: ff8163ef-30c6-4473-9fa7-e2715124d167
-		summarizeBy: sum
-		sourceColumn: Ordinal
-
-		annotation SummarizationSetBy = Automatic
-
diff --git a/CareTogether.SemanticModel/definition/tables/Role Approval.tmdl b/CareTogether.SemanticModel/definition/tables/Role Approval.tmdl
index 6d9f69f..fd367ee 100644
--- a/CareTogether.SemanticModel/definition/tables/Role Approval.tmdl	
+++ b/CareTogether.SemanticModel/definition/tables/Role Approval.tmdl	
@@ -6,8 +6,6 @@ table 'Role Approval'
 			VAR Tracker =
 			    SWITCH(
 			        TRUE(),
-			
-			        // Nível mais detalhado: mostrar somente se houver movimentação
 			        ISINSCOPE('Role Approval'[Entity Name]),
 			        VAR MaxDate = CALCULATE(
 			            MAX('Role Approval'[Date]),
@@ -15,7 +13,6 @@ table 'Role Approval'
 			        )
 			        RETURN IF(ISBLANK(MaxDate), BLANK(), FORMAT(MaxDate, "YYYY-MM-DD")),
 			
-			        // Nível intermediário: sempre mostrar
 			        ISINSCOPE('Role Approval'[Role Name]),
 			        FORMAT(CALCULATE(
 			            DISTINCTCOUNT('Role Approval'[Entity Id]),
@@ -33,6 +30,74 @@ table 'Role Approval'
 			    IF(ISBLANK(Tracker), BLANK(), Tracker)
 		lineageTag: 590209fb-c050-4003-98c4-8671173f3212
 
+	measure 'Volunteer Family Status Flag' = ```
+			
+			
+			// INACTIVE OR ACTIVE DEFINITION:  
+			// Inactive = only 'inactive' or 'denied'
+			// Blank = no role approval
+			// Active = anything other than 'inactive' or 'denied'
+			
+			VAR StartDate = [Selected Timeframe Start] 
+			VAR EndDate = [Selected Timeframe End]
+			
+			VAR FamilyInactive = 
+			    CALCULATE(
+			        COUNTROWS('Role Approval'),
+			        'Role Approval'[Date] >= StartDate && 'Role Approval'[Date] <= EndDate,
+			        'Approval Status'[Status] IN {"Inactive", "Denied"},
+			        'Role Approval'[Entity Type] = "Family",
+			        USERELATIONSHIP(Entity[FamilyId], 'Role Approval'[Entity Id]),
+			        CROSSFILTER(Entity[PersonId], 'Role Approval'[Entity Id], None)
+			    )
+			
+			VAR FamilyActive = 
+			    CALCULATE(
+			        COUNTROWS('Role Approval'),
+			        'Role Approval'[Date] >= StartDate && 'Role Approval'[Date] <= EndDate,
+			        NOT 'Role Approval'[Status] IN {"Inactive", "Denied"},
+			        'Role Approval'[Entity Type] = "Family",
+			        USERELATIONSHIP(Entity[FamilyId], 'Role Approval'[Entity Id]),
+			        CROSSFILTER(Entity[PersonId], 'Role Approval'[Entity Id], None)
+			    )
+			
+			
+			RETURN IF(FamilyActive > 0, "Active", IF(FamilyInactive > 0, "Inactive", IF(ISBLANK(FamilyActive + FamilyInactive), "No Role Approval")))
+			
+			```
+		lineageTag: 26c1a021-747c-49d8-aaf5-a983bb323c80
+
+	measure 'Volunteer Individual Status Flag' = ```
+			
+			
+			// Inactive or Active Definition: 
+			// Inactive = only 'inactive' or 'denied'
+			// Blank = no role approval
+			// Active = anything other than 'inactive' or 'denied'
+			
+			VAR StartDate = [Selected Timeframe Start] 
+			VAR EndDate = [Selected Timeframe End]
+			
+			VAR PersonInactive = 
+			    CALCULATE(
+			        COUNTROWS('Role Approval'),
+			        'Role Approval'[Date] >= StartDate && 'Role Approval'[Date] <= EndDate,
+			        'Approval Status'[Status] IN {"Inactive", "Denied"},
+			        'Role Approval'[Entity Type] = "Person"
+			    )
+			
+			VAR PersonActive = 
+			    CALCULATE(
+			        COUNTROWS('Role Approval'),
+			        'Role Approval'[Date] >= StartDate && 'Role Approval'[Date] <= EndDate,
+			        NOT 'Role Approval'[Status] IN {"Inactive", "Denied"},
+			        'Role Approval'[Entity Type] = "Person"
+			    )
+			
+			RETURN IF(PersonActive > 0, "Active", IF(PersonInactive > 0, "Inactive", IF(ISBLANK(PersonActive + PersonInactive), "No Role Approval")))
+			```
+		lineageTag: 41e6fa73-ec85-4a75-9af2-47bc0c8bddb0
+
 	column 'Entity Type'
 		dataType: string
 		lineageTag: 0fb1b97a-9aca-43be-aaaf-64c2d919515c
diff --git a/CareTogether.SemanticModel/diagramLayout.json b/CareTogether.SemanticModel/diagramLayout.json
index 70f62d5..cd282a5 100644
--- a/CareTogether.SemanticModel/diagramLayout.json
+++ b/CareTogether.SemanticModel/diagramLayout.json
@@ -258,16 +258,6 @@
           },
           "zIndex": 0
         },
-        {
-          "location": {},
-          "nodeIndex": "Export Contacts",
-          "nodeLineageTag": "60ba141e-f35f-47f1-89c6-55e30f55efa7",
-          "size": {
-            "height": 128,
-            "width": 234
-          },
-          "zIndex": 0
-        },
         {
           "location": {},
           "nodeIndex": "Arrangements by Entity",
@@ -377,7 +367,7 @@
       "ordinal": 1,
       "scrollPosition": {
         "x": 0,
-        "y": 388.24979944621577
+        "y": 208.36072570280245
       },
       "nodes": [
         {