diff --git a/assets/themes/ski/ski.json b/assets/themes/ski/ski.json
index e85c90aef..b6565af9b 100644
--- a/assets/themes/ski/ski.json
+++ b/assets/themes/ski/ski.json
@@ -17,14 +17,15 @@
         "map",
         "information_board"
       ],
-    "override":{
-      "minzoom": 13
-    },"pointRendering": [
-      {
-        "=iconSize": "25,25",
-        "=label": null
-      }
-    ]
+      "override": {
+        "minzoom": 13
+      },
+      "pointRendering": [
+        {
+          "=iconSize": "25,25",
+          "=label": null
+        }
+      ]
     },
     {
       "builtin": [
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 30c38f4d7..49bc5ddbe 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -246,9 +246,18 @@
             }
         },
         "tagRenderings": {
+            "duration": {
+                "question": "How long takes a single journey with this elevator?",
+                "questionHint": "This excludes the waiting time.",
+                "render": "A single journey takes {duration} minutes"
+            },
             "length": {
                 "render": "This aerialway is {_length:km} kilometer long"
             },
+            "occupancy": {
+                "question": "How many people fit a single carriage?",
+                "render": "{aerialway:occupancy} people fit a single carriage"
+            },
             "type": {
                 "mappings": {
                     "0": {
@@ -485,6 +494,7 @@
     },
     "assembly_point": {
         "description": "This layer contains assembly points and waiting areas where all employees, passengers or a large crowd assemble in case of an emergency.",
+        "name": "Emergency assembly points",
         "presets": {
             "0": {
                 "title": "an assembly point"
@@ -517,7 +527,9 @@
                 "question": "For which disaster type is this assembly point meant?"
             }
         },
-        "title": "Emergency assembly points"
+        "title": {
+            "render": "Assembly point during emergencies"
+        }
     },
     "atm": {
         "description": "ATMs to withdraw money",
@@ -3765,6 +3777,7 @@
     },
     "disaster_response": {
         "description": "This layer contains organizations that have the main objective to help the civil population during and after natural or anthropogenic disasters by working in the affected area.",
+        "name": "Disaster response organizations",
         "presets": {
             "0": {
                 "title": "a disaster response organization"
@@ -3776,7 +3789,9 @@
                 "render": "This organization is named <b>{name}</b>"
             }
         },
-        "title": "Disaster response organization"
+        "title": {
+            "render": "Disaster response organization"
+        }
     },
     "doctors": {
         "description": "This layer shows doctor offices",
diff --git a/langs/layers/it.json b/langs/layers/it.json
index b82abd85c..6ba9467b0 100644
--- a/langs/layers/it.json
+++ b/langs/layers/it.json
@@ -144,6 +144,7 @@
     },
     "assembly_point": {
         "description": "Questo livello contiene punti di raccolta e aree di attesa in cui tutti i dipendenti, i passeggeri o una grande folla si riuniscono in caso di emergenza.",
+        "name": "Punti di raccolta per emergenze",
         "presets": {
             "0": {
                 "title": "un punto di raccolta"
@@ -175,8 +176,7 @@
                 },
                 "question": "Per quali tipi di disastro è pensato questo punto di raccolta?"
             }
-        },
-        "title": "Punti di raccolta per emergenze"
+        }
     },
     "atm": {
         "description": "Sportello Bancomat per prelevare denaro",
@@ -1328,7 +1328,9 @@
                 "render": "Questa organizzazione si chiama <b>{name}</b>"
             }
         },
-        "title": "Organizzazione per la risposta ai disastri"
+        "title": {
+            "render": "Organizzazione per la risposta ai disastri"
+        }
     },
     "drinking_water": {
         "name": "Acqua potabile",