diff --git a/assets/layers/entrance/entrance.json b/assets/layers/entrance/entrance.json
index faacebce0a..9e6d268ff6 100644
--- a/assets/layers/entrance/entrance.json
+++ b/assets/layers/entrance/entrance.json
@@ -578,6 +578,43 @@
       ]
     }
   ],
+  "filter": [
+    {
+      "id": "width",
+      "options": [
+        {
+          "question": {
+            "en": "Any/No width info",
+            "de": "Beliebig/Keine Breiteninformationen",
+            "nl": "All kerbs",
+            "fr": "Toute/aucune information sur la largeur",
+            "da": "Eventuelle/ingen bredde info",
+            "cs": "Jakékoliv/žádné informace o šířce",
+            "es": "Información de ancho/sin información de ancho",
+            "ca": "Qualsevol/Sense informació d'amplada",
+            "pl": "Dowolna/brak informacji o szerokości",
+            "ko": "폭 정보 있음/없음"
+          }
+        },
+        {
+          "osmTags": "width=",
+          "question": {
+            "en": "Without width info",
+            "de": "Beliebige Breiteninformationen",
+            "nl": "Geen breedtes gekend",
+            "fr": "Pas d’information sur la largeur",
+            "da": "Uden bredde info",
+            "cs": "Bez informací o šířce",
+            "nb_NO": "Uten breddeinfo",
+            "ca": "Sense informació de l'amplada",
+            "es": "Sin información de ancho",
+            "pl": "Bez informacji o szerokości",
+            "ko": "폭 정보 없음"
+          }
+        }
+      ]
+    }
+  ],
   "allowMove": {
     "enableImproveAccuracy": true,
     "enableRelocation": false
diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json
index 7ac1def387..310c4f4f79 100644
--- a/assets/themes/onwheels/onwheels.json
+++ b/assets/themes/onwheels/onwheels.json
@@ -36,6 +36,42 @@
   "startLon": 4.350103,
   "hideFromOverview": false,
   "layers": [
+    {
+      "id": "onwheels_entrance_data",
+      "passAllFeatures": true,
+      "pointRendering": null,
+      "title": null,
+      "tagRenderings": [],
+      "allowMove": false,
+      "lineRendering": [
+        {
+          "color": "black",
+          "width": 1
+        }
+      ],
+      "shownByDefault": false,
+      "name": null,
+      "description": {
+        "en": "All objects which have entrance data mapped on the amenity instead of the entrance object"
+      },
+      "source": {
+        "osmTags": {
+          "and": [
+            "entrance=",
+            "indoor!=door",
+            "door=",
+            {
+              "or": [
+                "entrance:width~*",
+                "entrance:kerb:height~*",
+                "entrance:step_count~*",
+                "entrance:width~*"
+              ]
+            }
+          ]
+        }
+      }
+    },
     {
       "builtin": "indoors",
       "override": {
@@ -96,44 +132,7 @@
             ]
           }
         ],
-        "syncSelection": "theme-only",
-        "filter": [
-          {
-            "id": "width",
-            "options": [
-              {
-                "question": {
-                  "en": "Any/No width info",
-                  "de": "Beliebig/Keine Breiteninformationen",
-                  "nl": "All kerbs",
-                  "fr": "Toute/aucune information sur la largeur",
-                  "da": "Eventuelle/ingen bredde info",
-                  "cs": "Jakékoliv/žádné informace o šířce",
-                  "es": "Información de ancho/sin información de ancho",
-                  "ca": "Qualsevol/Sense informació d'amplada",
-                  "pl": "Dowolna/brak informacji o szerokości",
-                  "ko": "폭 정보 있음/없음"
-                }
-              },
-              {
-                "osmTags": "width=",
-                "question": {
-                  "en": "Without width info",
-                  "de": "Beliebige Breiteninformationen",
-                  "nl": "Geen breedtes gekend",
-                  "fr": "Pas d’information sur la largeur",
-                  "da": "Uden bredde info",
-                  "cs": "Bez informací o šířce",
-                  "nb_NO": "Uten breddeinfo",
-                  "ca": "Sense informació de l'amplada",
-                  "es": "Sin información de ancho",
-                  "pl": "Bez informacji o szerokości",
-                  "ko": "폭 정보 없음"
-                }
-              }
-            ]
-          }
-        ]
+        "syncSelection": "theme-only"
       }
     },
     {
@@ -410,7 +409,14 @@
         "syncSelection": "theme-only"
       }
     },
-    "walls_and_buildings",
+    {
+      "builtin": "walls_and_buildings",
+      "override": {
+        "calculatedTags+": [
+          "_entrance_data_within=overlapWith(feat)('onwheels_entrance_data').map(f => f.properties.id)"
+        ]
+      }
+    },
     {
       "builtin": "elevator",
       "override": {
@@ -538,6 +544,5 @@
       }
     ]
   },
-  "enableDownload": true,
-  "widenFactor": 2
+  "enableDownload": true
 }