diff --git a/assets/layers/climbing_route/climbing_route.json b/assets/layers/climbing_route/climbing_route.json
index 1ab39144a9..67d987b07c 100644
--- a/assets/layers/climbing_route/climbing_route.json
+++ b/assets/layers/climbing_route/climbing_route.json
@@ -206,7 +206,7 @@
         "fr": "Cette voie fait {canonical(climbing:length)} de long",
         "cs": "Tato trasa je {canonical(climbing:length)} dlouhá",
         "es": "Esta vía mide {canonical(climbing:length)} de largo",
-        "ca": "Aquesta ruta és {canonical(escalada: longitud)} llarga"
+        "ca": "Aquesta ruta és {canonical(climbing:length)} llarga"
       },
       "freeform": {
         "key": "climbing:length",
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index 462a4e7f33..159ca6ab26 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -790,7 +790,7 @@
           ]
         },
         {
-          "id": "platform",
+          "id": "added-image",
           "options": [
             {
               "question": {
@@ -800,27 +800,16 @@
                 "es": "El conjunto de cambios agregó al menos una imagen",
                 "ko": "주요 변경사항에 최소 하나의 이미지가 추가 되었습니다",
                 "nl": "Changeset voegde minstens één afbeelding toe"
-              }
-            },
-            {
-              "question": {
-                "en": "Made with Android"
               },
-              "osmTags": "android=yes"
-            },
-            {
-              "question": {
-                "en": "Made on the web"
-              },
-              "osmTags": "android="
+              "osmTags": "add-image>0"
             }
           ]
         },
         {
-          "id": "added-image",
+          "id": "exclude_grb",
           "options": [
             {
-              "osmTags": "add-image>0",
+              "osmTags": "theme!=grb",
               "question": {
                 "en": "Exclude GRB theme",
                 "de": "GRB-Thema ausschließen",
@@ -833,10 +822,10 @@
           ]
         },
         {
-          "id": "exclude_grb",
+          "id": "exclude_etymology",
           "options": [
             {
-              "osmTags": "theme!=grb",
+              "osmTags": "theme!=etymology",
               "question": {
                 "en": "Exclude etymology theme",
                 "de": "Etymologie-Thema ausschließen",
@@ -849,18 +838,25 @@
           ]
         },
         {
-          "id": "exclude_etymology",
+          "id": "platform",
           "options": [
             {
-              "osmTags": "theme!=etymology",
               "question": {
-                "en": "Exclude etymology theme",
-                "de": "Etymologie-Thema ausschließen",
-                "es": "Excluir el tema de etimología",
-                "cs": "Vyloučit etymologii tématu",
-                "nl": "Thema etymologie uitsluiten",
-                "ko": "어원 테마 제외"
-              }
+                "en": "All platforms"
+              },
+              "quesiton": "All platforms"
+            },
+            {
+              "question": {
+                "en": "Made with Android"
+              },
+              "osmTags": "android=yes"
+            },
+            {
+              "question": {
+                "en": "Made on the web"
+              },
+              "osmTags": "android="
             }
           ]
         }
diff --git a/src/Logic/State/UserSettingsMetaTagging.ts b/src/Logic/State/UserSettingsMetaTagging.ts
index 6e568c5c32..33a5ae85b5 100644
--- a/src/Logic/State/UserSettingsMetaTagging.ts
+++ b/src/Logic/State/UserSettingsMetaTagging.ts
@@ -1,42 +1,14 @@
 import { Utils } from "../../Utils"
 /** This code is autogenerated - do not edit. Edit ./assets/layers/usersettings/usersettings.json instead */
 export class ThemeMetaTagging {
-    public static readonly themeName = "usersettings"
+   public static readonly themeName = "usersettings"
 
-    public metaTaggging_for_usersettings(feat: { properties: Record<string, string> }) {
-        Utils.AddLazyProperty(feat.properties, "_mastodon_candidate_md", () =>
-            feat.properties._description
-                .match(/\[[^\]]*\]\((.*(mastodon|en.osm.town).*)\).*/)
-                ?.at(1)
-        )
-        Utils.AddLazyProperty(
-            feat.properties,
-            "_d",
-            () => feat.properties._description?.replace(/&lt;/g, "<")?.replace(/&gt;/g, ">") ?? ""
-        )
-        Utils.AddLazyProperty(feat.properties, "_mastodon_candidate_a", () =>
-            ((feat) => {
-                const e = document.createElement("div")
-                e.innerHTML = feat.properties._d
-                return Array.from(e.getElementsByTagName("a")).filter(
-                    (a) => a.href.match(/mastodon|en.osm.town/) !== null
-                )[0]?.href
-            })(feat)
-        )
-        Utils.AddLazyProperty(feat.properties, "_mastodon_link", () =>
-            ((feat) => {
-                const e = document.createElement("div")
-                e.innerHTML = feat.properties._d
-                return Array.from(e.getElementsByTagName("a")).filter(
-                    (a) => a.getAttribute("rel")?.indexOf("me") >= 0
-                )[0]?.href
-            })(feat)
-        )
-        Utils.AddLazyProperty(
-            feat.properties,
-            "_mastodon_candidate",
-            () => feat.properties._mastodon_candidate_md ?? feat.properties._mastodon_candidate_a
-        )
-        feat.properties["__current_backgroun"] = "initial_value"
-    }
-}
+   public metaTaggging_for_usersettings(feat: {properties: Record<string, string>}) {
+      Utils.AddLazyProperty(feat.properties, '_mastodon_candidate_md', () => feat.properties._description.match(/\[[^\]]*\]\((.*(mastodon|en.osm.town).*)\).*/)?.at(1) ) 
+      Utils.AddLazyProperty(feat.properties, '_d', () => feat.properties._description?.replace(/&lt;/g,'<')?.replace(/&gt;/g,'>') ?? '' ) 
+      Utils.AddLazyProperty(feat.properties, '_mastodon_candidate_a', () => (feat => {const e = document.createElement('div');e.innerHTML = feat.properties._d;return Array.from(e.getElementsByTagName("a")).filter(a => a.href.match(/mastodon|en.osm.town/) !== null)[0]?.href   }) (feat)  ) 
+      Utils.AddLazyProperty(feat.properties, '_mastodon_link', () => (feat => {const e = document.createElement('div');e.innerHTML = feat.properties._d;return Array.from(e.getElementsByTagName("a")).filter(a => a.getAttribute("rel")?.indexOf('me') >= 0)[0]?.href})(feat)  ) 
+      Utils.AddLazyProperty(feat.properties, '_mastodon_candidate', () => feat.properties._mastodon_candidate_md ?? feat.properties._mastodon_candidate_a ) 
+      feat.properties['__current_backgroun'] = 'initial_value'
+   }
+}
\ No newline at end of file