diff --git a/src/components/maps/Map.astro b/src/components/maps/Map.astro
index aa3a9661..9adbf8ec 100644
--- a/src/components/maps/Map.astro
+++ b/src/components/maps/Map.astro
@@ -22,7 +22,7 @@ const {
 <div class="world-wrapper">
     <div id="world"></div>
 
-    <MarkerCreator client:load mapKey={mapKey} />
+    <MarkerCreator client:visible mapKey={mapKey} />
 </div>
 
 <script
diff --git a/src/components/maps/MapOverlay.astro b/src/components/maps/MapOverlay.astro
index 8aca62ff..4743810f 100644
--- a/src/components/maps/MapOverlay.astro
+++ b/src/components/maps/MapOverlay.astro
@@ -21,7 +21,7 @@ const {
 ---
 
 <div class="world-overlay">
-    <SearchMarkers client:load mapKey={mapKey} markers={markers} players={players} searchConfig={searchConfig} />
+    <SearchMarkers client:visible mapKey={mapKey} markers={markers} players={players} searchConfig={searchConfig} />
 
     <MapOverlayBreadcrumbs breadcrumbs={breadcrumbs} />
 </div>
diff --git a/src/components/maps/overlay/SearchMapSwitch.vue b/src/components/maps/overlay/SearchMapSwitch.vue
index 20bf6d7a..63fbee84 100644
--- a/src/components/maps/overlay/SearchMapSwitch.vue
+++ b/src/components/maps/overlay/SearchMapSwitch.vue
@@ -41,12 +41,12 @@ const worldMenuItems: MenuItem[] = [
     {
         name: 'Aldys',
         img: '/images/aldys-cover.png',
-        url: '/'
+        url: `/${$currentLang.value}/`
     },
     {
         name: 'Bamast',
         img: '/images/bamast-cover.png',
-        url: '/bamast',
+        url: `/${$currentLang.value}/bamast`
     }
 ]
 
@@ -59,12 +59,12 @@ const cityMenuItems: MenuItem[] = [
     {
         name: 'Borélis',
         img: '/images/aldys-borelis-cover.png',
-        url: '/aldys/borelis',
+        url: `/${$currentLang.value}/aldys/borelis`
     },
     {
         name: 'Cantane',
         img: '/images/aldys-cantane-cover.png',
-        url: '/aldys/cantane',
+        url: `/${$currentLang.value}/aldys/cantane`
     },
 ]
 
@@ -72,7 +72,7 @@ const extraMenuitems: MenuItem[] = [
     {
         name: 'Mines Blanches',
         img: '/images/aldys-cantane-mines-blanches-cover.png',
-        url: '/aldys/cantane/mines-blanches',
+        url: `/${$currentLang.value}/aldys/cantane/mines-blanches`,
         newItem: true
     },
 ]
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index f239c1a9..dd704d3c 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -1,5 +1,5 @@
 ---
-import { defaultLang, type Language } from '@/i18n/ui';
+import { defaultLang } from '@/i18n/ui';
 import { getLangFromUrl } from '@/i18n/utils';
 import type { Head } from '@/types/Head';
 
diff --git a/src/pages/en/aldys/cantane/white-hollow.astro b/src/pages/en/aldys/cantane/mines-blanches.astro
similarity index 92%
rename from src/pages/en/aldys/cantane/white-hollow.astro
rename to src/pages/en/aldys/cantane/mines-blanches.astro
index 784e23db..688bca65 100644
--- a/src/pages/en/aldys/cantane/white-hollow.astro
+++ b/src/pages/en/aldys/cantane/mines-blanches.astro
@@ -21,7 +21,7 @@ const markers = markersData.data as MapMarker[]
         breadcrumbs={[
             { name: 'Aldys', url: '/en/' },
             { name: 'Cantane', url: '/en/aldys/cantane' },
-            { name: 'White Hollow', url: '/en/aldys/cantane/white-hollow' },
+            { name: 'White Hollow', url: '/en/aldys/cantane/mines-blanches' },
         ]}
     />
     <Map