diff --git a/assets/layers/cinema/cinema.json b/assets/layers/cinema/cinema.json
index 207703b1e3..df5d5e2c84 100644
--- a/assets/layers/cinema/cinema.json
+++ b/assets/layers/cinema/cinema.json
@@ -24,14 +24,6 @@
   },
   "minzoom": 10,
   "title": {
-    "mappings": [
-      {
-        "if": "name~*",
-        "then": {
-          "*": "{name}"
-        }
-      }
-    ],
     "render": {
       "en": "Cinema",
       "de": "Kino",
@@ -41,7 +33,15 @@
       "ca": "Cinema",
       "cy": "Sinema",
       "it": "Cinema"
-    }
+    },
+    "mappings": [
+      {
+        "if": "name~*",
+        "then": {
+          "*": "{name}"
+        }
+      }
+    ]
   },
   "pointRendering": [
     {
diff --git a/assets/layers/tourism_accomodation/tourism_accomodation.json b/assets/layers/tourism_accomodation/tourism_accomodation.json
index 11d35b95de..c243ca73f9 100644
--- a/assets/layers/tourism_accomodation/tourism_accomodation.json
+++ b/assets/layers/tourism_accomodation/tourism_accomodation.json
@@ -20,6 +20,14 @@
   },
   "minzoom": 12,
   "title": {
+    "render": {
+      "en": "Tourist accomodation {name}",
+      "de": "Touristenunterkunft {name}",
+      "es": "Alojamiento turístico {name}",
+      "ca": "Allotjament turístic {name}",
+      "cs": "Turistická ubytovna {name}",
+      "it": "Struttura ricettiva turistica {name}"
+    },
     "mappings": [
       {
         "if": "tourism=hotel",
@@ -103,15 +111,7 @@
           "cs": "Víkendový dům {name}"
         }
       }
-    ],
-    "render": {
-      "en": "Tourist accomodation {name}",
-      "de": "Touristenunterkunft {name}",
-      "es": "Alojamiento turístico {name}",
-      "ca": "Allotjament turístic {name}",
-      "cs": "Turistická ubytovna {name}",
-      "it": "Struttura ricettiva turistica {name}"
-    }
+    ]
   },
   "pointRendering": [
     {
diff --git a/assets/layers/windpump/windpump.json b/assets/layers/windpump/windpump.json
index e6db7ea52e..474cdff0b1 100644
--- a/assets/layers/windpump/windpump.json
+++ b/assets/layers/windpump/windpump.json
@@ -6,6 +6,10 @@
     "cs": "Větrné pumpy"
   },
   "title": {
+    "render": {
+      "en": "Windpump {ref}",
+      "cs": "Větrná pumpa {ref}"
+    },
     "mappings": [
       {
         "if": "name~*",
@@ -14,11 +18,7 @@
           "cs": "Větrná pumpa {ref}"
         }
       }
-    ],
-    "render": {
-      "en": "Windpump {ref}",
-      "cs": "Větrná pumpa {ref}"
-    }
+    ]
   },
   "pointRendering": [
     {
diff --git a/src/Models/ThemeConfig/Conversion/PrepareLayer.ts b/src/Models/ThemeConfig/Conversion/PrepareLayer.ts
index d9fb39481f..664a907eff 100644
--- a/src/Models/ThemeConfig/Conversion/PrepareLayer.ts
+++ b/src/Models/ThemeConfig/Conversion/PrepareLayer.ts
@@ -1107,7 +1107,6 @@ export class OrderTagRendering extends DesugaringStep<TagRenderingConfigJson | s
         if (typeof json !== "object") {
             return json
         }
-        console.log("Ordering", json.id, OrderTagRendering.tagRenderingAttributesOrder)
         return Utils.reorder(json, OrderTagRendering.tagRenderingAttributesOrder)
     }
 
@@ -1129,10 +1128,16 @@ export class OrderLayer extends DesugaringStep<string | LayerConfigJson> {
         if (typeof json === "string") {
             return json
         }
+        const orderTag = new OrderTagRendering()
         // @ts-ignore
         json = new On<"tagRenderings", TagRenderingConfigJson[], LayerConfigJson>("tagRenderings", new Each(
-            new OrderTagRendering(),
+           orderTag,
         )).convert(<LayerConfigJson>json, context)
+
+        // @ts-ignore
+        json = new On("title", orderTag).convert(json, context)
+
+
         return Utils.reorder(json, OrderLayer.layerAttributesOrder)
     }
 }