diff --git a/firebase/admin/firestore.indexes.json b/firebase/admin/firestore.indexes.json
index 60b0f6239..6f8410647 100644
--- a/firebase/admin/firestore.indexes.json
+++ b/firebase/admin/firestore.indexes.json
@@ -2,8 +2,12 @@
   "indexes": [
     {
       "collectionGroup": "administrations",
-      "queryScope": "COLLECTION_GROUP",
+      "queryScope": "COLLECTION",
       "fields": [
+        {
+          "fieldPath": "readOrgs.districts",
+          "arrayConfig": "CONTAINS"
+        },
         {
           "fieldPath": "testData",
           "order": "ASCENDING"
@@ -19,9 +23,13 @@
       "queryScope": "COLLECTION",
       "fields": [
         {
-          "fieldPath": "readOrgs.classes",
+          "fieldPath": "readOrgs.groups",
           "arrayConfig": "CONTAINS"
         },
+        {
+          "fieldPath": "testData",
+          "order": "ASCENDING"
+        },
         {
           "fieldPath": "name",
           "order": "ASCENDING"
@@ -33,8 +41,8 @@
       "queryScope": "COLLECTION",
       "fields": [
         {
-          "fieldPath": "readOrgs.districts",
-          "arrayConfig": "CONTAINS"
+          "fieldPath": "testData",
+          "order": "ASCENDING"
         },
         {
           "fieldPath": "name",
@@ -43,43 +51,47 @@
       ]
     },
     {
-      "collectionGroup": "administrations",
-      "queryScope": "COLLECTION",
+      "collectionGroup": "assignedOrgs",
+      "queryScope": "COLLECTION_GROUP",
       "fields": [
         {
-          "fieldPath": "readOrgs.families",
-          "arrayConfig": "CONTAINS"
+          "fieldPath": "orgId",
+          "order": "ASCENDING"
         },
         {
-          "fieldPath": "name",
+          "fieldPath": "dateClosed",
           "order": "ASCENDING"
         }
       ]
     },
     {
-      "collectionGroup": "administrations",
-      "queryScope": "COLLECTION",
+      "collectionGroup": "assignedOrgs",
+      "queryScope": "COLLECTION_GROUP",
       "fields": [
         {
-          "fieldPath": "readOrgs.groups",
-          "arrayConfig": "CONTAINS"
+          "fieldPath": "orgId",
+          "order": "ASCENDING"
         },
         {
-          "fieldPath": "name",
+          "fieldPath": "testData",
           "order": "ASCENDING"
         }
       ]
     },
     {
-      "collectionGroup": "administrations",
-      "queryScope": "COLLECTION",
+      "collectionGroup": "assignedOrgs",
+      "queryScope": "COLLECTION_GROUP",
       "fields": [
         {
-          "fieldPath": "readOrgs.schools",
-          "arrayConfig": "CONTAINS"
+          "fieldPath": "orgId",
+          "order": "ASCENDING"
         },
         {
-          "fieldPath": "name",
+          "fieldPath": "testData",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "dateClosed",
           "order": "ASCENDING"
         }
       ]
@@ -3035,12 +3047,26 @@
       "queryScope": "COLLECTION",
       "fields": [
         {
-          "fieldPath": "districtId",
+          "fieldPath": "schoolId",
           "order": "ASCENDING"
         },
         {
-          "fieldPath": "lastRoarSync",
+          "fieldPath": "name",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "classes",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "schoolId",
           "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "name",
+          "order": "DESCENDING"
         }
       ]
     },
@@ -3086,6 +3112,52 @@
         }
       ]
     },
+    {
+      "collectionGroup": "readOrgs",
+      "queryScope": "COLLECTION_GROUP",
+      "fields": [
+        {
+          "fieldPath": "orgId",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "dateClosed",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "readOrgs",
+      "queryScope": "COLLECTION_GROUP",
+      "fields": [
+        {
+          "fieldPath": "orgId",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "testData",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "readOrgs",
+      "queryScope": "COLLECTION_GROUP",
+      "fields": [
+        {
+          "fieldPath": "orgId",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "testData",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "dateClosed",
+          "order": "ASCENDING"
+        }
+      ]
+    },
     {
       "collectionGroup": "schools",
       "queryScope": "COLLECTION",
@@ -3203,7 +3275,147 @@
           "order": "ASCENDING"
         },
         {
-          "fieldPath": "lastRoarSync",
+          "fieldPath": "abbreviation",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "schools",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "districtId",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "abbreviation",
+          "order": "DESCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "schools",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "districtId",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "address",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "schools",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "districtId",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "address",
+          "order": "DESCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "schools",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "districtId",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "name",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "schools",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "districtId",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "name",
+          "order": "DESCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "users",
+      "queryScope": "COLLECTION_GROUP",
+      "fields": [
+        {
+          "fieldPath": "classes.current",
+          "arrayConfig": "CONTAINS"
+        },
+        {
+          "fieldPath": "name",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "users",
+      "queryScope": "COLLECTION_GROUP",
+      "fields": [
+        {
+          "fieldPath": "districts.current",
+          "arrayConfig": "CONTAINS"
+        },
+        {
+          "fieldPath": "name",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "users",
+      "queryScope": "COLLECTION_GROUP",
+      "fields": [
+        {
+          "fieldPath": "families.current",
+          "arrayConfig": "CONTAINS"
+        },
+        {
+          "fieldPath": "name",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "users",
+      "queryScope": "COLLECTION_GROUP",
+      "fields": [
+        {
+          "fieldPath": "groups.current",
+          "arrayConfig": "CONTAINS"
+        },
+        {
+          "fieldPath": "name",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "users",
+      "queryScope": "COLLECTION_GROUP",
+      "fields": [
+        {
+          "fieldPath": "schools.current",
+          "arrayConfig": "CONTAINS"
+        },
+        {
+          "fieldPath": "name",
           "order": "ASCENDING"
         }
       ]
@@ -3454,20 +3666,6 @@
         }
       ]
     },
-    {
-      "collectionGroup": "users",
-      "queryScope": "COLLECTION",
-      "fields": [
-        {
-          "fieldPath": "districts.current",
-          "arrayConfig": "CONTAINS"
-        },
-        {
-          "fieldPath": "archived",
-          "order": "ASCENDING"
-        }
-      ]
-    },
     {
       "collectionGroup": "users",
       "queryScope": "COLLECTION",
@@ -4334,45 +4532,25 @@
       "collectionGroup": "administrations",
       "fieldPath": "classes",
       "ttl": false,
-      "indexes": [
-        {
-          "arrayConfig": "CONTAINS",
-          "queryScope": "COLLECTION"
-        }
-      ]
+      "indexes": []
     },
     {
       "collectionGroup": "administrations",
       "fieldPath": "districts",
       "ttl": false,
-      "indexes": [
-        {
-          "arrayConfig": "CONTAINS",
-          "queryScope": "COLLECTION"
-        }
-      ]
+      "indexes": []
     },
     {
       "collectionGroup": "administrations",
       "fieldPath": "families",
       "ttl": false,
-      "indexes": [
-        {
-          "arrayConfig": "CONTAINS",
-          "queryScope": "COLLECTION"
-        }
-      ]
+      "indexes": []
     },
     {
       "collectionGroup": "administrations",
       "fieldPath": "groups",
       "ttl": false,
-      "indexes": [
-        {
-          "arrayConfig": "CONTAINS",
-          "queryScope": "COLLECTION"
-        }
-      ]
+      "indexes": []
     },
     {
       "collectionGroup": "administrations",
@@ -4390,10 +4568,6 @@
         {
           "arrayConfig": "CONTAINS",
           "queryScope": "COLLECTION"
-        },
-        {
-          "order": "ASCENDING",
-          "queryScope": "COLLECTION_GROUP"
         }
       ]
     },
@@ -4405,73 +4579,36 @@
     },
     {
       "collectionGroup": "administrations",
-      "fieldPath": "readOrgs.classes",
-      "ttl": false,
-      "indexes": [
-        {
-          "arrayConfig": "CONTAINS",
-          "queryScope": "COLLECTION"
-        }
-      ]
-    },
-    {
-      "collectionGroup": "administrations",
-      "fieldPath": "readOrgs.districts",
+      "fieldPath": "schools",
       "ttl": false,
-      "indexes": [
-        {
-          "arrayConfig": "CONTAINS",
-          "queryScope": "COLLECTION"
-        }
-      ]
+      "indexes": []
     },
     {
       "collectionGroup": "administrations",
-      "fieldPath": "readOrgs.families",
+      "fieldPath": "testData",
       "ttl": false,
       "indexes": [
         {
-          "arrayConfig": "CONTAINS",
+          "order": "ASCENDING",
           "queryScope": "COLLECTION"
-        }
-      ]
-    },
-    {
-      "collectionGroup": "administrations",
-      "fieldPath": "readOrgs.groups",
-      "ttl": false,
-      "indexes": [
+        },
         {
-          "arrayConfig": "CONTAINS",
+          "order": "DESCENDING",
           "queryScope": "COLLECTION"
-        }
-      ]
-    },
-    {
-      "collectionGroup": "administrations",
-      "fieldPath": "readOrgs.schools",
-      "ttl": false,
-      "indexes": [
+        },
         {
           "arrayConfig": "CONTAINS",
           "queryScope": "COLLECTION"
-        }
-      ]
-    },
-    {
-      "collectionGroup": "administrations",
-      "fieldPath": "schools",
-      "ttl": false,
-      "indexes": [
+        },
         {
-          "arrayConfig": "CONTAINS",
-          "queryScope": "COLLECTION"
+          "order": "ASCENDING",
+          "queryScope": "COLLECTION_GROUP"
         }
       ]
     },
     {
-      "collectionGroup": "administrations",
-      "fieldPath": "testData",
+      "collectionGroup": "assignedOrgs",
+      "fieldPath": "orgId",
       "ttl": false,
       "indexes": [
         {
@@ -4548,6 +4685,29 @@
       "ttl": false,
       "indexes": []
     },
+    {
+      "collectionGroup": "readOrgs",
+      "fieldPath": "orgId",
+      "ttl": false,
+      "indexes": [
+        {
+          "order": "ASCENDING",
+          "queryScope": "COLLECTION"
+        },
+        {
+          "order": "DESCENDING",
+          "queryScope": "COLLECTION"
+        },
+        {
+          "arrayConfig": "CONTAINS",
+          "queryScope": "COLLECTION"
+        },
+        {
+          "order": "ASCENDING",
+          "queryScope": "COLLECTION_GROUP"
+        }
+      ]
+    },
     {
       "collectionGroup": "status",
       "fieldPath": "completion",