diff --git a/Common/Server/Infrastructure/Postgres/SchemaMigrations/1767966850199-RenameServiceCatalogToService.ts b/Common/Server/Infrastructure/Postgres/SchemaMigrations/1767966850199-RenameServiceCatalogToService.ts
index b5119e52c9..5ff9ae8206 100644
--- a/Common/Server/Infrastructure/Postgres/SchemaMigrations/1767966850199-RenameServiceCatalogToService.ts
+++ b/Common/Server/Infrastructure/Postgres/SchemaMigrations/1767966850199-RenameServiceCatalogToService.ts
@@ -61,9 +61,7 @@ export class RenameServiceCatalogToService1767966850199
      */
 
     // Rename main ServiceCatalog table to Service
-    await queryRunner.query(
-      `ALTER TABLE "ServiceCatalog" RENAME TO "Service"`,
-    );
+    await queryRunner.query(`ALTER TABLE "ServiceCatalog" RENAME TO "Service"`);
 
     // Rename ServiceCatalogMonitor to ServiceMonitor
     await queryRunner.query(
@@ -131,9 +129,7 @@ export class RenameServiceCatalogToService1767966850199
       `ALTER TABLE "ServiceMonitor" RENAME TO "ServiceCatalogMonitor"`,
     );
 
-    await queryRunner.query(
-      `ALTER TABLE "Service" RENAME TO "ServiceCatalog"`,
-    );
+    await queryRunner.query(`ALTER TABLE "Service" RENAME TO "ServiceCatalog"`);
 
     // Step 2: Rename columns back to original names
     await queryRunner.query(
diff --git a/Dashboard/src/Components/Exceptions/ExceptionExplorer.tsx b/Dashboard/src/Components/Exceptions/ExceptionExplorer.tsx
index b9fd7e6009..53aeacc456 100644
--- a/Dashboard/src/Components/Exceptions/ExceptionExplorer.tsx
+++ b/Dashboard/src/Components/Exceptions/ExceptionExplorer.tsx
@@ -503,7 +503,11 @@ const ExceptionExplorer: FunctionComponent<ComponentProps> = (
         modelType={TelemetryException}
         modelId={props.telemetryExceptionId}
         onDeleteSuccess={() => {
-          Navigation.navigate(RouteMap[PageMap.EXCEPTIONS] as Route);
+          Navigation.navigate(
+            RouteUtil.populateRouteParams(
+              RouteMap[PageMap.EXCEPTIONS] as Route,
+            ),
+          );
         }}
       />
     </div>
diff --git a/Dashboard/src/Pages/CodeRepository/View/Delete.tsx b/Dashboard/src/Pages/CodeRepository/View/Delete.tsx
index 24c7a73936..1cc057e0f5 100644
--- a/Dashboard/src/Pages/CodeRepository/View/Delete.tsx
+++ b/Dashboard/src/Pages/CodeRepository/View/Delete.tsx
@@ -1,5 +1,5 @@
 import PageMap from "../../../Utils/PageMap";
-import RouteMap from "../../../Utils/RouteMap";
+import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
 import PageComponentProps from "../../PageComponentProps";
 import Route from "Common/Types/API/Route";
 import ObjectID from "Common/Types/ObjectID";
@@ -19,7 +19,12 @@ const CodeRepositoryDelete: FunctionComponent<
         modelType={CodeRepository}
         modelId={modelId}
         onDeleteSuccess={() => {
-          Navigation.navigate(RouteMap[PageMap.CODE_REPOSITORY] as Route);
+          Navigation.navigate(
+            RouteUtil.populateRouteParams(
+              RouteMap[PageMap.CODE_REPOSITORY] as Route,
+              { modelId },
+            ),
+          );
         }}
       />
     </Fragment>
diff --git a/Dashboard/src/Pages/Dashboards/View/Delete.tsx b/Dashboard/src/Pages/Dashboards/View/Delete.tsx
index 745764629d..837838ef64 100644
--- a/Dashboard/src/Pages/Dashboards/View/Delete.tsx
+++ b/Dashboard/src/Pages/Dashboards/View/Delete.tsx
@@ -1,5 +1,5 @@
 import PageMap from "../../../Utils/PageMap";
-import RouteMap from "../../../Utils/RouteMap";
+import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
 import PageComponentProps from "../../PageComponentProps";
 import Route from "Common/Types/API/Route";
 import ObjectID from "Common/Types/ObjectID";
@@ -19,7 +19,12 @@ const DashboardDelete: FunctionComponent<
         modelType={Dashboard}
         modelId={modelId}
         onDeleteSuccess={() => {
-          Navigation.navigate(RouteMap[PageMap.DASHBOARDS] as Route);
+          Navigation.navigate(
+            RouteUtil.populateRouteParams(
+              RouteMap[PageMap.DASHBOARDS] as Route,
+              { modelId },
+            ),
+          );
         }}
       />
     </Fragment>
diff --git a/Dashboard/src/Pages/OnCallDuty/OnCallDutyPolicy/Delete.tsx b/Dashboard/src/Pages/OnCallDuty/OnCallDutyPolicy/Delete.tsx
index 3c7b0bc61a..5f41aa1230 100644
--- a/Dashboard/src/Pages/OnCallDuty/OnCallDutyPolicy/Delete.tsx
+++ b/Dashboard/src/Pages/OnCallDuty/OnCallDutyPolicy/Delete.tsx
@@ -1,5 +1,5 @@
 import PageMap from "../../../Utils/PageMap";
-import RouteMap from "../../../Utils/RouteMap";
+import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
 import PageComponentProps from "../../PageComponentProps";
 import Route from "Common/Types/API/Route";
 import ObjectID from "Common/Types/ObjectID";
@@ -19,7 +19,12 @@ const OnCallPolicyDelete: FunctionComponent<
         modelType={OnCallDutyPolicy}
         modelId={modelId}
         onDeleteSuccess={() => {
-          Navigation.navigate(RouteMap[PageMap.ON_CALL_DUTY] as Route);
+          Navigation.navigate(
+            RouteUtil.populateRouteParams(
+              RouteMap[PageMap.ON_CALL_DUTY] as Route,
+              { modelId },
+            ),
+          );
         }}
       />
     </Fragment>
diff --git a/Dashboard/src/Pages/OnCallDuty/OnCallDutySchedule/Delete.tsx b/Dashboard/src/Pages/OnCallDuty/OnCallDutySchedule/Delete.tsx
index efaf5c3d1b..7310281271 100644
--- a/Dashboard/src/Pages/OnCallDuty/OnCallDutySchedule/Delete.tsx
+++ b/Dashboard/src/Pages/OnCallDuty/OnCallDutySchedule/Delete.tsx
@@ -1,5 +1,5 @@
 import PageMap from "../../../Utils/PageMap";
-import RouteMap from "../../../Utils/RouteMap";
+import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
 import PageComponentProps from "../../PageComponentProps";
 import Route from "Common/Types/API/Route";
 import ObjectID from "Common/Types/ObjectID";
@@ -19,7 +19,12 @@ const OnCallScheduleDelete: FunctionComponent<
         modelType={OnCallDutySchedule}
         modelId={modelId}
         onDeleteSuccess={() => {
-          Navigation.navigate(RouteMap[PageMap.ON_CALL_DUTY] as Route);
+          Navigation.navigate(
+            RouteUtil.populateRouteParams(
+              RouteMap[PageMap.ON_CALL_DUTY] as Route,
+              { modelId },
+            ),
+          );
         }}
       />
     </Fragment>
diff --git a/Dashboard/src/Pages/Service/Services.tsx b/Dashboard/src/Pages/Service/Services.tsx
index f7db4d1110..ecafac0cbf 100644
--- a/Dashboard/src/Pages/Service/Services.tsx
+++ b/Dashboard/src/Pages/Service/Services.tsx
@@ -59,8 +59,7 @@ const ServicesPage: FunctionComponent<
             labels: true,
           },
           title: "Labels",
-          description:
-            "Labels help you categorize and organize your services.",
+          description: "Labels help you categorize and organize your services.",
           fieldType: FormFieldSchemaType.MultiSelectDropdown,
           required: false,
           placeholder: "Labels",
diff --git a/Dashboard/src/Pages/Settings/AIAgentView.tsx b/Dashboard/src/Pages/Settings/AIAgentView.tsx
index 3fa2d8ca2c..f3c49ea8e9 100644
--- a/Dashboard/src/Pages/Settings/AIAgentView.tsx
+++ b/Dashboard/src/Pages/Settings/AIAgentView.tsx
@@ -3,7 +3,7 @@ import UserElement from "../../Components/User/User";
 import ProjectUtil from "Common/UI/Utils/Project";
 import PageMap from "../../Utils/PageMap";
 import ProjectUser from "../../Utils/ProjectUser";
-import RouteMap from "../../Utils/RouteMap";
+import RouteMap, { RouteUtil } from "../../Utils/RouteMap";
 import PageComponentProps from "../PageComponentProps";
 import Route from "Common/Types/API/Route";
 import BadDataException from "Common/Types/Exception/BadDataException";
@@ -453,7 +453,12 @@ const AIAgentView: FunctionComponent<PageComponentProps> = (
         modelType={AIAgent}
         modelId={modelId}
         onDeleteSuccess={() => {
-          Navigation.navigate(RouteMap[PageMap.SETTINGS_AI_AGENTS] as Route);
+          Navigation.navigate(
+            RouteUtil.populateRouteParams(
+              RouteMap[PageMap.SETTINGS_AI_AGENTS] as Route,
+              { modelId },
+            ),
+          );
         }}
       />
     </Fragment>
diff --git a/Dashboard/src/Pages/Settings/ProbeView.tsx b/Dashboard/src/Pages/Settings/ProbeView.tsx
index f11fd8233c..2d1063b0fd 100644
--- a/Dashboard/src/Pages/Settings/ProbeView.tsx
+++ b/Dashboard/src/Pages/Settings/ProbeView.tsx
@@ -3,7 +3,7 @@ import UserElement from "../../Components/User/User";
 import ProjectUtil from "Common/UI/Utils/Project";
 import PageMap from "../../Utils/PageMap";
 import ProjectUser from "../../Utils/ProjectUser";
-import RouteMap from "../../Utils/RouteMap";
+import RouteMap, { RouteUtil } from "../../Utils/RouteMap";
 import PageComponentProps from "../PageComponentProps";
 import Route from "Common/Types/API/Route";
 import BadDataException from "Common/Types/Exception/BadDataException";
@@ -433,7 +433,12 @@ const TeamView: FunctionComponent<PageComponentProps> = (
         modelType={Probe}
         modelId={modelId}
         onDeleteSuccess={() => {
-          Navigation.navigate(RouteMap[PageMap.SETTINGS_PROBES] as Route);
+          Navigation.navigate(
+            RouteUtil.populateRouteParams(
+              RouteMap[PageMap.SETTINGS_PROBES] as Route,
+              { modelId },
+            ),
+          );
         }}
       />
     </Fragment>
diff --git a/Dashboard/src/Pages/Settings/TeamView.tsx b/Dashboard/src/Pages/Settings/TeamView.tsx
index 237266137a..3b49775561 100644
--- a/Dashboard/src/Pages/Settings/TeamView.tsx
+++ b/Dashboard/src/Pages/Settings/TeamView.tsx
@@ -629,7 +629,11 @@ const TeamView: FunctionComponent<PageComponentProps> = (
         modelType={Team}
         modelId={Navigation.getLastParamAsObjectID()}
         onDeleteSuccess={() => {
-          Navigation.navigate(RouteMap[PageMap.SETTINGS_TEAMS] as Route);
+          Navigation.navigate(
+            RouteUtil.populateRouteParams(
+              RouteMap[PageMap.SETTINGS_TEAMS] as Route,
+            ),
+          );
         }}
       />
     </Fragment>
diff --git a/Dashboard/src/Pages/StatusPages/View/Delete.tsx b/Dashboard/src/Pages/StatusPages/View/Delete.tsx
index 01334c6f90..b2370a9cf5 100644
--- a/Dashboard/src/Pages/StatusPages/View/Delete.tsx
+++ b/Dashboard/src/Pages/StatusPages/View/Delete.tsx
@@ -1,5 +1,5 @@
 import PageMap from "../../../Utils/PageMap";
-import RouteMap from "../../../Utils/RouteMap";
+import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
 import PageComponentProps from "../../PageComponentProps";
 import Route from "Common/Types/API/Route";
 import ObjectID from "Common/Types/ObjectID";
@@ -19,7 +19,12 @@ const StatusPageDelete: FunctionComponent<
         modelType={StatusPage}
         modelId={modelId}
         onDeleteSuccess={() => {
-          Navigation.navigate(RouteMap[PageMap.STATUS_PAGES] as Route);
+          Navigation.navigate(
+            RouteUtil.populateRouteParams(
+              RouteMap[PageMap.STATUS_PAGES] as Route,
+              { modelId },
+            ),
+          );
         }}
       />
     </Fragment>
diff --git a/Dashboard/src/Pages/Telemetry/Services/View/Delete.tsx b/Dashboard/src/Pages/Telemetry/Services/View/Delete.tsx
index f3052da33d..3ee4d724cc 100644
--- a/Dashboard/src/Pages/Telemetry/Services/View/Delete.tsx
+++ b/Dashboard/src/Pages/Telemetry/Services/View/Delete.tsx
@@ -1,5 +1,5 @@
 import PageMap from "../../../../Utils/PageMap";
-import RouteMap from "../../../../Utils/RouteMap";
+import RouteMap, { RouteUtil } from "../../../../Utils/RouteMap";
 import PageComponentProps from "../../../PageComponentProps";
 import Route from "Common/Types/API/Route";
 import ObjectID from "Common/Types/ObjectID";
@@ -19,7 +19,12 @@ const ServiceDelete: FunctionComponent<
         modelType={TelemetryService}
         modelId={modelId}
         onDeleteSuccess={() => {
-          Navigation.navigate(RouteMap[PageMap.TELEMETRY_SERVICES] as Route);
+          Navigation.navigate(
+            RouteUtil.populateRouteParams(
+              RouteMap[PageMap.TELEMETRY_SERVICES] as Route,
+              { modelId },
+            ),
+          );
         }}
       />
     </Fragment>