diff --git a/src/main/resources/schema/SMF_ChartApiConfig.json b/src/main/resources/schema/SMF_ChartApiConfig.json
index 49f753269c8b2dbd49cbbfa9547ea5e5a20a6dfa..1721d1a3dde0047c6a5f1ae1e8140d69008e30f7 100644
--- a/src/main/resources/schema/SMF_ChartApiConfig.json
+++ b/src/main/resources/schema/SMF_ChartApiConfig.json
@@ -95,7 +95,7 @@
         "dateRefField": "timestamp",
         "indexName": "fs-forms-data",
         "esInstance": "QUADNARY",
-        "aggrQuery": "{\"aggs\":{\"Inspection Completed\":{\"filter\":{\"bool\":{\"filter\":[{\"terms\":{\"status.keyword\":[\"INSCOMPLETED\"],\"boost\":1}}],\"adjust_pure_negative\":true,\"boost\":1}},\"aggs\":{\"Performing Lead Inspectors\":{\"terms\":{\"field\":\"inspection.leadInspector\"}}}}}}"
+        "aggrQuery": "{\"aggs\":{\"Inspection Completed\":{\"filter\":{\"bool\":{\"filter\":[{\"terms\":{\"inspection.assignedTo.status.keyword\":[\"INSCOMPLETED\"],\"boost\":1}}],\"adjust_pure_negative\":true,\"boost\":1}},\"aggs\":{\"Lead Inspector Status\":{\"terms\":{\"field\":\"inspection.assignedTo.leadInspector\",\"size\":10},\"aggs\":{\"Performing Lead Inspectors\":{\"terms\":{\"field\":\"inspection.assignedTo.firstName.keyword\",\"size\":5}}}}}}}}"
       }
     ],
     "chartType": "bar",
diff --git a/src/main/resources/schema/SMF_MasterDashboardConfig.json b/src/main/resources/schema/SMF_MasterDashboardConfig.json
index b7fe7fc20f9cc4dc30305ae7b8bfabd97858ddbe..4136b6e7d04a0a921d9a51dbe2658fede04e304a 100644
--- a/src/main/resources/schema/SMF_MasterDashboardConfig.json
+++ b/src/main/resources/schema/SMF_MasterDashboardConfig.json
@@ -38,6 +38,7 @@
             {
               "id": 111,
               "name": "Application Status Count",
+              "description": "A view of all the applications and their status",
               "dimensions": {
                 "height": 250,
                 "width": 4
@@ -59,6 +60,7 @@
             {
               "id": 111,
               "name": "Application Submission Trend",
+              "description": "Over a period of time, how many applications have been submitted and the trend",
               "dimensions": {
                 "height": 250,
                 "width": 4
@@ -80,6 +82,7 @@
             {
               "id": 111,
               "name": "Performing Lead Inspectors",
+              "description": "High performing Lead Inspectors and their inspections count",
               "dimensions": {
                 "height": 250,
                 "width": 4
@@ -107,6 +110,7 @@
             {
               "id": 111,
               "name": "Pending Approved and Rejected",
+              "description": "A split of the status indicators to get a high level view of all the applications",
               "dimensions": {
                 "height": 250,
                 "width": 4