diff --git a/assets/layers/usersettings/usersettings.json b/assets/layers/usersettings/usersettings.json
index 4034defc8b..a98a6536d4 100644
--- a/assets/layers/usersettings/usersettings.json
+++ b/assets/layers/usersettings/usersettings.json
@@ -372,7 +372,7 @@
       "mappings": [
         {
           "if": "mapcomplete-show_crosshair=yes",
-          "then": "Show a crosshair in the center of the map (when zoomed in above level 17)"
+          "then": "Show a crosshair in the center of the map when zoomed in above level 17"
         },
         {
           "if": "mapcomplete-show_crosshair=no",
@@ -382,6 +382,10 @@
           "if": "mapcomplete-show_crosshair=",
           "then": "Do not show a crosshair in the center of the map",
           "hideInAnswer": true
+        },
+        {
+          "if": "mapcomplete-show_crosshair=always",
+          "then": "Always show a crosshair in the center of the map"
         }
       ]
     },
diff --git a/assets/themes/campersite/campersite.json b/assets/themes/campersite/campersite.json
index 8ee63fe1c7..4636e50279 100644
--- a/assets/themes/campersite/campersite.json
+++ b/assets/themes/campersite/campersite.json
@@ -84,7 +84,7 @@
         "eu": "Akanpatzeko tokiak",
         "pl": "Miejsca kamperowe"
       },
-      "minzoom": 10,
+      "minzoom": 7,
       "source": {
         "osmTags": {
           "and": [
@@ -967,7 +967,7 @@
         "es": "Estaciones sanitarias",
         "pl": "Stacje zrzutów sanitarnych"
       },
-      "minzoom": 10,
+      "minzoom": 7,
       "source": {
         "osmTags": {
           "and": [
diff --git a/assets/themes/cyclofix/cyclofix.json b/assets/themes/cyclofix/cyclofix.json
index 790c172ee9..c13fc113b4 100644
--- a/assets/themes/cyclofix/cyclofix.json
+++ b/assets/themes/cyclofix/cyclofix.json
@@ -40,8 +40,20 @@
     "Originally created during Open Summer of Code by Pieter Fiers, Thibault Declercq, Pierre Barban, Joost Schouppe and Pieter Vander Vennet"
   ],
   "layers": [
-    "bike_cafe",
-    "bike_shop",
+    {
+      "builtin": [
+        "bike_cafe",
+        "bike_shop",
+        "bike_repair_station",
+        "bicycle_tube_vending_machine",
+        "drinking_water",
+        "bike_themed_object",
+        "bike_cleaning"
+      ],
+      "override": {
+        "minzoom": 11
+      }
+    },
     {
       "builtin": [
         "bicycle_rental"
@@ -54,7 +66,7 @@
           {
             "marker": [
               {
-                "icon":"pin",
+                "icon": "pin",
                 "color": "#ba2792"
               },
               {
@@ -110,11 +122,6 @@
         "minzoom": 13
       }
     },
-    "bike_repair_station",
-    "bicycle_tube_vending_machine",
-    "drinking_water",
-    "bike_themed_object",
-    "bike_cleaning",
     "bike_parking",
     {
       "builtin": [
diff --git a/assets/themes/grb/grb.json b/assets/themes/grb/grb.json
index 45d54d53d4..f240ee15a9 100644
--- a/assets/themes/grb/grb.json
+++ b/assets/themes/grb/grb.json
@@ -785,7 +785,7 @@
     }
   ],
   "overrideAll": {
-    "minzoom": 18
+    "minzoom": 17
   },
   "widenFactor": 2,
   "overpassMaxZoom": 15,