diff --git a/odyseja-ui/src/routes/panel/stage/+page.svelte b/odyseja-ui/src/routes/panel/stage/+page.svelte
index 57789a8..20104c4 100644
--- a/odyseja-ui/src/routes/panel/stage/+page.svelte
+++ b/odyseja-ui/src/routes/panel/stage/+page.svelte
@@ -1,6 +1,8 @@
 <script lang="ts">
     import {put} from "$lib/apiService";
     import type {Stages} from "$lib/types"
+    import {city} from "$lib/cityStore";
+    import {fetchStages} from "./stageService";
 
     export let data;
 
@@ -8,6 +10,11 @@
 
     $: isChanged = JSON.stringify(data) !== JSON.stringify(initialData);
 
+    city.subscribe(async currentCity => {
+        data = await fetchStages();
+        initialData = JSON.parse(JSON.stringify(data))
+    });
+
     function save() {
         saveStages(data.stages);
         initialData = JSON.parse(JSON.stringify(data))
diff --git a/odyseja-ui/src/routes/panel/stage/+page.ts b/odyseja-ui/src/routes/panel/stage/+page.ts
index d2d6431..041e0e9 100644
--- a/odyseja-ui/src/routes/panel/stage/+page.ts
+++ b/odyseja-ui/src/routes/panel/stage/+page.ts
@@ -1,14 +1,8 @@
-import {get} from '$lib/apiService';
-import type { PageLoad } from './$types';
-import type {Stage, Stages} from "$lib/types";
+import type {PageLoad} from './$types';
+import {fetchStages} from "./stageService";
 
 export const load = (({params}) => {
     return fetchStages();
 }) satisfies PageLoad;
 
 
-async function fetchStages(): Promise<Stages> {
-    const data = await get('/stage')
-    const stages = data as Stage[]
-    return {stages: stages};
-}
diff --git a/odyseja-ui/src/routes/panel/stage/stageService.ts b/odyseja-ui/src/routes/panel/stage/stageService.ts
new file mode 100644
index 0000000..cb5cbc4
--- /dev/null
+++ b/odyseja-ui/src/routes/panel/stage/stageService.ts
@@ -0,0 +1,8 @@
+import type {Stage, Stages} from "$lib/types";
+import {get} from "$lib/apiService";
+
+export async function fetchStages(): Promise<Stages> {
+    const data = await get('/stage')
+    const stages = data as Stage[]
+    return {stages: stages};
+}
\ No newline at end of file
diff --git a/src/main/kotlin/odyseja/odysejapka/rest/StageController.kt b/src/main/kotlin/odyseja/odysejapka/rest/StageController.kt
index 7800592..0fc77fb 100644
--- a/src/main/kotlin/odyseja/odysejapka/rest/StageController.kt
+++ b/src/main/kotlin/odyseja/odysejapka/rest/StageController.kt
@@ -11,14 +11,9 @@ class StageController(
   private val stageService: StageService
 ) {
 
-  @GetMapping("{cityId}")
-  fun getStages(@PathVariable cityId: Int): List<Stage> {
-    return stageService.getStages(cityId)
-  }
-
-  @GetMapping
-  fun getStages(): List<Stage> {
-    return stageService.getStages()
+  @GetMapping()
+  fun getStages(@RequestParam(required = false) cityId: Int?): List<Stage> {
+    return cityId?.let { stageService.getStages(cityId) } ?: stageService.getStages()
   }
 
   @Secured("ROLE_ADMIN")