diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.proto.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.proto.json
index 5d4ac38cc..95d0dc691 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.proto.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.proto.json
@@ -167,28 +167,6 @@
             }
           ]
         },
-        {
-          "id": "exclude_grb",
-          "options": [
-            {
-              "osmTags": "theme!=grb",
-              "question": {
-                "en": "Exclude GRB theme"
-              }
-            }
-          ]
-        },
-        {
-          "id": "exclude_etymology",
-          "options": [
-            {
-              "osmTags": "theme!=etymology",
-              "question": {
-                "en": "Exclude etymology theme"
-              }
-            }
-          ]
-        },
         {
           "id": "created_by",
           "options": [
@@ -297,6 +275,28 @@
               }
             }
           ]
+        },
+        {
+          "id": "exclude_grb",
+          "options": [
+            {
+              "osmTags": "theme!=grb",
+              "question": {
+                "en": "Exclude GRB theme"
+              }
+            }
+          ]
+        },
+        {
+          "id": "exclude_etymology",
+          "options": [
+            {
+              "osmTags": "theme!=etymology",
+              "question": {
+                "en": "Exclude etymology theme"
+              }
+            }
+          ]
         }
       ]
     },
diff --git a/package.json b/package.json
index df7c93a40..2f8f269e5 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "optimize-images": "cd assets/generated/ &&  find -name '*.png' -exec optipng '{}' \\; && echo 'PNGs are optimized'",
     "generate:stats": "vite-node scripts/GenerateSeries.ts",
     "reset:layeroverview": "mkdir -p ./src/assets/generated/layers; echo {\\\"themes\\\":[]} > ./src/assets/generated/known_themes.json && echo {\\\"layers\\\": []} > ./src/assets/generated/known_layers.json && rm -f ./src/assets/generated/layers/*.json && rm -f ./src/assets/generated/themes/*.json && cp ./assets/layers/usersettings/usersettings.json ./src/assets/generated/layers/usersettings.json && echo '{}' > ./src/assets/generated/layers/favourite.json && npm run generate:layeroverview && vite-node scripts/generateLayerOverview.ts -- --force",
-    "generate": "mkdir -p ./assets/generated; npm run generate:licenses; npm run generate:images; npm run generate:charging-stations; npm run generate:translations; npm run reset:layeroverview; npm run generate:service-worker",
+    "generate": "npm run generate:licenses && npm run generate:images && npm run generate:charging-stations && npm run generate:translations && npm run refresh:layeroverview && npm run generate:service-worker",
     "generate:charging-stations": "cd ./assets/layers/charging_station && vite-node csvToJson.ts && cd -",
     "prepare-deploy": "npm run generate:service-worker && ./scripts/build.sh",
     "lint": "npm run lint:prettier && npm run lint:eslint",
diff --git a/scripts/build.sh b/scripts/build.sh
index c8cf9ec65..c989e5803 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -15,7 +15,6 @@ export NODE_OPTIONS="--max-old-space-size=16384"
 # This script ends every line with '&&' to chain everything. A failure will thus stop the build
 npm run generate:editor-layer-index &&
 npm run generate &&
-npm run refresh:layeroverview && # an extra refersh is needed, as the favourites layer won't have expanded icons otherwise
 npm run generate:layouts
 
 if [ $? -ne 0 ]; then