diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
index ba0ebe58401..b86feca27e5 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
@@ -30,10 +30,6 @@ if (window?.globalPath === 'sandbox-ui') {
       includeSubTenants: true
     },
     body: {
-      "inbox": {
-        "limit": 10,
-        "offset": 0
-      },
       apiOperation: "SEARCH",
     },
     config: {
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js
index ce56dcc9c86..8d8c8cece8b 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js
@@ -17,10 +17,6 @@ if (window.globalPath === 'sandbox-ui') {
       includeSubTenants: true
     },
     body: {
-      "inbox": {
-        "limit": 10,
-        "offset": 0
-      },
       apiOperation: "SEARCH",
     },
     config: {
@@ -43,9 +39,26 @@ const { data: subTenants, refetch, isLoading: isLoadingSubTenants } = requestCri
     const { city_complaint } = value;
     return city_complaint ? city_complaint : null;
   });
+
+  const { isLoading: hierarchyLOading, data:hierarchyType } = Digit.Hooks.useCustomMDMS(
+    Digit.ULBService.getStateId(),
+     "sandbox-ui",
+      [
+        { name: "ModuleMasterConfig",filter:'[?(@.module == "PGR")].master[?(@.type == "boundary")]' 
+
+        }
+      ],
+      {
+        select: (data) => {
+          const formattedData = data?.["sandbox-ui"]?.["ModuleMasterConfig"]
+          return formattedData?.[0]?.code;
+        },
+      }
+    );
+
   const { data: fetchedLocalities } = Digit.Hooks.useBoundaryLocalities(
     selectedCity?.code,
-    window.globalPath === "sandbox-ui" ? "REVENUE" : "admin",
+    hierarchyType,
     {
       enabled: !!selectedCity,
     },
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
index 8ea99cfbf91..db142311d82 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
@@ -27,10 +27,6 @@ if (window.globalPath === 'sandbox-ui') {
       includeSubTenants: true
     },
     body: {
-      "inbox": {
-        "limit": 10,
-        "offset": 0
-      },
       apiOperation: "SEARCH",
     },
     config: {
@@ -62,24 +58,31 @@ const { data: subTenants, refetch, isLoading: isLoadingSubTenants } = requestCri
 
   const cityData = window.globalPath === "sandbox-ui" ? getSubTenants() : getCities();
 
+  const { isLoading: hierarchyLOading, data:hierarchyType } = Digit.Hooks.useCustomMDMS(
+    Digit.ULBService.getStateId(),
+     "sandbox-ui",
+      [
+        { name: "ModuleMasterConfig",filter:'[?(@.module == "PGR")].master[?(@.type == "boundary")]' 
+
+        }
+      ],
+      {
+        select: (data) => {
+          const formattedData = data?.["sandbox-ui"]?.["ModuleMasterConfig"]
+          return formattedData?.[0]?.code;
+        },
+      }
+    );
+
   const { data: fetchedLocalities } = Digit.Hooks.useBoundaryLocalities(
   cityData[0]?.code,
-  window.globalPath === "sandbox-ui" ? "REVENUE" : "admin",
+  hierarchyType,
   {
     enabled: !!cityData[0],
   },
   t
 );
 
-  // const { data: fetchedLocalities } = Digit.Hooks.useBoundaryLocalities(
-  //   getCities()[0]?.code,
-  //   "admin",
-  //   {
-  //     enabled: !!getCities()[0],
-  //   },
-  //   t
-  // );
-
   const [localities, setLocalities] = useState(fetchedLocalities);
   const [selectedLocality, setSelectedLocality] = useState(null);
   const [canSubmit, setSubmitValve] = useState(false);