diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json
index 2994e849b3..d62f1e68b9 100644
--- a/assets/themes/onwheels/onwheels.json
+++ b/assets/themes/onwheels/onwheels.json
@@ -34,17 +34,23 @@
   "overrideAll": {
     "+calculatedTags": [
       "_poi_walls_and_buildings_entrance_properties=feat.closestn('walls_and_buildings', 1, undefined, 1000).map(w => ({id: w.feat.properties.id, width: w.feat.properties['_entrance:width']}))[0]",
+      "_poi_entrance:id=JSON.parce(feat.properties._poi_walls_and_buildings_entrance_properteis)?.id",
       "_poi_entrance:width=JSON.parse(feat.properties._poi_walls_and_buildings_entrance_properties)?.width"
     ],
     "+tagRenderings": [
       {
         "id": "_poi_entrance:width",
-        "condition": "entrance=",
+        "condition": {
+          "and": [
+            "entrance=",
+            "kerb="
+          ]
+        },
         "render": {
-          "en": "This door has a width of {canonical(_poi_entrance:width)} meter",
-          "nl": "Deze deur heeft een breedte van {canonical(_poi_entrance:width)} meter",
-          "de": "Diese Tür hat eine Durchgangsbreite von {canonical(_poi_entrance:width)} Meter",
-          "es": "Esta puerta tiene una ancho de {canonical(_poi_entrance:width)} metros"
+          "en": "<a href='#{_poi_entrance:id}'>This door has a width of {canonical(_poi_entrance:width)} meters</a>",
+          "nl": "<a href='#{_poi_entrance:id}'>Deze deur heeft een breedte van {canonical(_poi_entrance:width)} meter</a>",
+          "de": "<a href='#{_poi_entrance:id}'>Diese Tür hat eine Durchgangsbreite von {canonical(_poi_entrance:width)} Meter</a>",
+          "es": "<a href='#{_poi_entrance:id}'>Esta puerta tiene una ancho de {canonical(_poi_entrance:width)} metros</a>"
         },
         "freeform": {
           "key": "_poi_entrance:width",