diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json
index 60a743c60..56f74cdec 100644
--- a/assets/layers/cycleways_and_roads/cycleways_and_roads.json
+++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json
@@ -273,6 +273,9 @@
       "width": "8"
     }
   ],
+  "calculatedTags": [
+    "width:= ! ! (feat.properties['width:carriageway']) ? feat.properties['width:carriageway'] : feat.properties['width'] "
+  ],
   "tagRenderings": [
     "images",
     {
@@ -1289,16 +1292,16 @@
         ]
       },
       "render": {
-        "en": "The carriage width of this road is <strong>{width:carriageway}m</strong>",
-        "nl": "De breedte van deze rijbaan in deze straat is <strong>{width:carriageway}m</strong>",
-        "de": "Die Fahrbahnbreite dieser Straße beträgt <strong>{width:carriageway}m</strong>",
-        "fr": "La largeur de cette chaussée est de <strong>{width:carriageway}m</strong>",
-        "ca": "L'amplada dels carrils d'aquesta carretera és <strong>{width:carriageway}m</strong>",
-        "cs": "Šířka vozovky této silnice je <strong>{width:carriageway}m</strong>",
-        "es": "El ancho de la calzada de esta carretera es de <strong>{width:carriageway}m</strong>"
+        "en": "The carriage width of this road is <strong>{width}m</strong>",
+        "nl": "De breedte van deze rijbaan in deze straat is <strong>{width}m</strong>",
+        "de": "Die Fahrbahnbreite dieser Straße beträgt <strong>{width}m</strong>",
+        "fr": "La largeur de cette chaussée est de <strong>{width}m</strong>",
+        "ca": "L'amplada dels carrils d'aquesta carretera és <strong>{width}m</strong>",
+        "cs": "Šířka vozovky této silnice je <strong>{width}m</strong>",
+        "es": "El ancho de la calzada de esta carretera es de <strong>{width}m</strong>"
       },
       "freeform": {
-        "key": "width:carriageway",
+        "key": "width",
         "type": "distance",
         "helperArgs": [
           "20",
@@ -1314,7 +1317,7 @@
         "cs": "Jaká je šířka vozovky této silnice (v metrech)?",
         "es": "¿Cuál es el ancho de la calzada de esta carretera (en metros)?"
       },
-      "id": "width:carriageway",
+      "id": "width",
       "questionHint": {
         "en": "This is measured curb to curb and thus includes the width of parallell parking lanes",
         "nl": "Dit is gemeten van stoepsteen tot stoepsteen, dus inclusief een parallelle parkeerstrook",
diff --git a/langs/layers/ca.json b/langs/layers/ca.json
index 4c871f3b2..40d207118 100644
--- a/langs/layers/ca.json
+++ b/langs/layers/ca.json
@@ -2889,10 +2889,10 @@
                 },
                 "question": "Aquesta carretera està il·luminada?"
             },
-            "width:carriageway": {
+            "width": {
                 "question": "Quina és l'amplada dels carrils d'aquesta carretera (en metres)?",
                 "questionHint": "Això es mesura de vorera a vorera i, per tant, inclou l'amplada dels aparcaments en línia",
-                "render": "L'amplada dels carrils d'aquesta carretera és <strong>{width:carriageway}m</strong>"
+                "render": "L'amplada dels carrils d'aquesta carretera és <strong>{width}m</strong>"
             }
         },
         "title": {
diff --git a/langs/layers/cs.json b/langs/layers/cs.json
index 1b916cd7b..8d6c793b4 100644
--- a/langs/layers/cs.json
+++ b/langs/layers/cs.json
@@ -3694,10 +3694,10 @@
                 },
                 "question": "Je tato ulice osvětlená?"
             },
-            "width:carriageway": {
+            "width": {
                 "question": "Jaká je šířka vozovky této silnice (v metrech)?",
                 "questionHint": "Jedná se o měření od krajnice ke krajnici a to včetně šířky paralelních parkovacích pruhů",
-                "render": "Šířka vozovky této silnice je <strong>{width:carriageway}m</strong>"
+                "render": "Šířka vozovky této silnice je <strong>{width}m</strong>"
             }
         },
         "title": {
diff --git a/langs/layers/de.json b/langs/layers/de.json
index 7214fcbc9..a3fb02655 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -3958,10 +3958,10 @@
                 },
                 "question": "Ist diese Straße beleuchtet?"
             },
-            "width:carriageway": {
+            "width": {
                 "question": "Wie groß ist die Fahrbahnbreite dieser Straße (in Metern)?",
                 "questionHint": "Diese wird von Bordstein zu Bordstein gemessen und schließt daher die Breite von parallelen Parkspuren ein",
-                "render": "Die Fahrbahnbreite dieser Straße beträgt <strong>{width:carriageway}m</strong>"
+                "render": "Die Fahrbahnbreite dieser Straße beträgt <strong>{width}m</strong>"
             }
         },
         "title": {
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 9491780d5..5bef75b8a 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -4009,10 +4009,10 @@
                 },
                 "question": "Is this street lit?"
             },
-            "width:carriageway": {
+            "width": {
                 "question": "What is the carriage width of this road (in meters)?",
                 "questionHint": "This is measured curb to curb and thus includes the width of parallell parking lanes",
-                "render": "The carriage width of this road is <strong>{width:carriageway}m</strong>"
+                "render": "The carriage width of this road is <strong>{width}m</strong>"
             }
         },
         "title": {
diff --git a/langs/layers/es.json b/langs/layers/es.json
index 9633344eb..c91e7fe29 100644
--- a/langs/layers/es.json
+++ b/langs/layers/es.json
@@ -3950,10 +3950,10 @@
                 },
                 "question": "¿Está iluminada esta calle?"
             },
-            "width:carriageway": {
+            "width": {
                 "question": "¿Cuál es el ancho de la calzada de esta carretera (en metros)?",
                 "questionHint": "Esto se mide de bordillo a bordillo e incluye el ancho de los carriles de aparcamiento paralelos",
-                "render": "El ancho de la calzada de esta carretera es de <strong>{width:carriageway}m</strong>"
+                "render": "El ancho de la calzada de esta carretera es de <strong>{width}m</strong>"
             }
         },
         "title": {
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index 3a918d648..4865e37f5 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -2795,10 +2795,10 @@
                 },
                 "question": "Cette rue est-elle éclairée ?"
             },
-            "width:carriageway": {
+            "width": {
                 "question": "Quelle est la largeur de cette chaussée (en mètres) ?",
                 "questionHint": "Elle est mesurée d'une bordure à l'autre et inclut donc la largeur des voies de stationnement parallèles",
-                "render": "La largeur de cette chaussée est de <strong>{width:carriageway}m</strong>"
+                "render": "La largeur de cette chaussée est de <strong>{width}m</strong>"
             }
         },
         "title": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index fc60afc0d..a45565b83 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -3964,10 +3964,10 @@
                 },
                 "question": "Is deze weg verlicht?"
             },
-            "width:carriageway": {
+            "width": {
                 "question": "Hoe breed is de rijbaan in deze straat (in meters)?",
                 "questionHint": "Dit is gemeten van stoepsteen tot stoepsteen, dus inclusief een parallelle parkeerstrook",
-                "render": "De breedte van deze rijbaan in deze straat is <strong>{width:carriageway}m</strong>"
+                "render": "De breedte van deze rijbaan in deze straat is <strong>{width}m</strong>"
             }
         },
         "title": {