diff --git a/app/src/components/map/LayerSwipe.vue b/app/src/components/map/LayerSwipe.vue
index de4b625f7b..7d52fe3ee1 100644
--- a/app/src/components/map/LayerSwipe.vue
+++ b/app/src/components/map/LayerSwipe.vue
@@ -107,16 +107,7 @@ export default {
       const dataGroup = map.getLayers().getArray().find((l) => l.get('id') === 'dataGroup');
       this.mergedConfigsData.forEach((config) => {
         const swipeLayer = dataGroup.getLayers().getArray().find((l) => l.get('name') === `${config.name}_compare`);
-        if (config.protocol === 'geoserverTileLayer' && swipeLayer) {
-          loadIndicatorExternalData(
-            time, config,
-          ).then((data) => {
-            this.$store.state.indicators.selectedIndicator.compareMapData = data;
-            swipeLayer.changed();
-          });
-        } else if (swipeLayer) {
-          swipeLayer.changed();
-        }
+        swipeLayer.changed();
       });
     },
     time(time) {
diff --git a/app/src/components/map/VectorTileStyleControl.vue b/app/src/components/map/VectorTileStyleControl.vue
index 25ba656675..bc28c0025c 100644
--- a/app/src/components/map/VectorTileStyleControl.vue
+++ b/app/src/components/map/VectorTileStyleControl.vue
@@ -1,7 +1,7 @@
 <template>
   <v-container fluid>
     <v-row align="center"
-    v-if="queryParameters.items.length > 1">
+    v-if="queryParameters.items?.length > 1">
       <v-col cols="6">
         <v-subheader>
           Data properties
@@ -42,7 +42,7 @@ export default {
     const selected = this.queryParameters?.selected;
     if (this.queryParameters?.selected && this.queryParameters?.items?.length > 1) {
       this.select = this.queryParameters?.items.find((item) => item.id === selected);
-    } else {
+    } else if (this.queryParameters?.items) {
       [this.select] = this.queryParameters?.items;
     }
   },
diff --git a/app/src/config/gtif.js b/app/src/config/gtif.js
index d55ce30539..6321e6f6e3 100644
--- a/app/src/config/gtif.js
+++ b/app/src/config/gtif.js
@@ -246,9 +246,9 @@ const solarAndGreenRoofDefaults = [
   baseLayers.s1EodcBackscattervh,
   baseLayers.geolandbasemap,
   {
-    ...baseLayers.bmapgelaende, visible: true,
+    ...baseLayers.bmaporthofoto30cm, visible: true,
   },
-  baseLayers.bmaporthofoto30cm,
+  baseLayers.bmapgelaende,
   baseLayers.eoxosm,
   baseLayers.cloudless,
   baseLayers.terrainLight,