diff --git a/assets/layers/entrance/entrance.json b/assets/layers/entrance/entrance.json
index 651d251c94..4f5a4dca31 100644
--- a/assets/layers/entrance/entrance.json
+++ b/assets/layers/entrance/entrance.json
@@ -33,7 +33,6 @@
     }
   },
   "calculatedTags": [
-    ""
   ],
   "tagRenderings": [
     "images",
@@ -344,74 +343,6 @@
         "type": "distance"
       }
     },
-    {
-      "id": "kerb-type",
-      "question": {
-        "en": "What is the height of this kerb?",
-        "nl": "Hoe hoog is deze stoeprand?",
-        "de": "Wie hoch ist der Bordstein?"
-      },
-      "mappings": [
-        {
-          "if": "kerb=raised",
-          "then": {
-            "en": "This kerb is raised (>3 cm)",
-            "nl": "Deze stoeprand is hoog (>3 cm)",
-            "de": "Der Bordstein ist erhöht (>3 cm)"
-          },
-          "icon": {
-            "path": "./assets/layers/kerbs/raised.svg",
-            "class": "small"
-          }
-        },
-        {
-          "if": "kerb=lowered",
-          "then": {
-            "en": "This kerb is lowered (~3 cm)",
-            "nl": "Deze stoeprand is verlaagd (~3 cm)",
-            "de": "Der Bordstein ist abgesenkt (~3 cm)"
-          },
-          "icon": {
-            "path": "./assets/layers/kerbs/lowered.svg",
-            "class": "small"
-          }
-        },
-        {
-          "if": "kerb=flush",
-          "then": {
-            "en": "This kerb is flush (~0cm)",
-            "nl": "Deze stoeprand is vlak (~0cm)",
-            "de": "Der Bordstein ist bündig (~0cm)"
-          },
-          "icon": {
-            "path": "./assets/layers/kerbs/flush.svg",
-            "class": "small"
-          }
-        },
-        {
-          "if": "kerb=no",
-          "then": {
-            "en": "There is no kerb here",
-            "nl": "Er is hier geen stoeprand",
-            "de": "Hier gibt es keinen Bordstein"
-          },
-          "hideInAnswer": true,
-          "icon": {
-            "path": "./assets/layers/kerbs/no.svg",
-            "class": "small"
-          }
-        },
-        {
-          "if": "kerb=yes",
-          "then": {
-            "en": "There is a kerb of unknown height",
-            "nl": "Er is een stoeprand met onbekende hoogte",
-            "de": "Es gibt einen Bordstein mit unbekannter Höhe"
-          },
-          "hideInAnswer": true
-        }
-      ]
-    },
     {
       "id": "kerb-height",
       "question": {
@@ -432,7 +363,13 @@
           "de": "Höhe des Bordsteins"
         },
         "type": "pnat"
-      }
+      },
+      "mappings": [
+        {
+          "if": "kerb-height=",
+          "then": "kerb-height=0"
+        }
+      ]
     }
   ],
   "mapRendering": [
diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.json b/assets/layers/walls_and_buildings/walls_and_buildings.json
index 133a2bf0f2..4ef1816e6a 100644
--- a/assets/layers/walls_and_buildings/walls_and_buildings.json
+++ b/assets/layers/walls_and_buildings/walls_and_buildings.json
@@ -47,7 +47,7 @@
   "calculatedTags": [
     "_entrance_properties=feat.overlapWith('entrance')?.map(e => e.feat.properties).filter(p => p !== undefined).filter(p => p.width !== undefined)",
     "_entrance:id=feat.get('_entrance_properties')?.map(e => e.id)?.at(0)",
-    "_entrance:width=feat.get('_entrance_properties')?.map(e => e.width)"
+    "_entrance:width=feat.get('_entrance_properties')?.map(e => e.width)?.at(0)"
   ],
   "tagRenderings": [
     {