diff --git a/web/src/lib/components/trail/map_with_elevation_maplibre.svelte b/web/src/lib/components/trail/map_with_elevation_maplibre.svelte
index 0a2b9dcb..013e3158 100644
--- a/web/src/lib/components/trail/map_with_elevation_maplibre.svelte
+++ b/web/src/lib/components/trail/map_with_elevation_maplibre.svelte
@@ -667,7 +667,7 @@
                     ) {
                         map!.addSource("terrain", {
                             type: "raster-dem",
-                            url: $page.data.settings?.terrain?.terrain,
+                            url: $page.data.settings.terrain.terrain,
                         });
                     }
                     if (
@@ -676,7 +676,7 @@
                     ) {
                         map!.addSource("hillshading", {
                             type: "raster-dem",
-                            url: $page.data.settings?.terrain?.hillshading,
+                            url: $page.data.settings.terrain.hillshading,
                         });
                         map!.addLayer({
                             id: "hillshading",
diff --git a/web/src/routes/settings/display/+page.svelte b/web/src/routes/settings/display/+page.svelte
index c043ed16..87c16bda 100644
--- a/web/src/routes/settings/display/+page.svelte
+++ b/web/src/routes/settings/display/+page.svelte
@@ -57,8 +57,8 @@
         selectedLanguage = settings?.language || "en";
         selectedMapFocus = settings?.mapFocus ?? "trails";
 
-        terrainURL = settings?.terrain.terrain ?? "";
-        hillshadingURL = settings?.terrain.hillshading ?? "";
+        terrainURL = settings?.terrain?.terrain ?? "";
+        hillshadingURL = settings?.terrain?.hillshading ?? "";
     });
 
     async function searchCities(q: string) {
@@ -141,8 +141,8 @@
     }
 
     $: terrainSaveEnabled =
-        terrainURL !== settings.terrain?.terrain ||
-        hillshadingURL !== settings.terrain.hillshading;
+        terrainURL !== settings?.terrain?.terrain ||
+        hillshadingURL !== settings?.terrain?.hillshading;
 </script>
 
 <svelte:head>
@@ -171,6 +171,7 @@
                         <Search
                             items={searchDropdownItems}
                             placeholder="{$_('search-cities')}..."
+                            clearAfterSelect={false}
                             bind:value={citySearchQuery}
                             on:update={(e) => searchCities(e.detail)}
                             on:click={(e) => handleSearchClick(e.detail)}