diff --git a/assets/layers/transit_stops/transit_stops.json b/assets/layers/transit_stops/transit_stops.json
index 6b663f21f2..8a20356033 100644
--- a/assets/layers/transit_stops/transit_stops.json
+++ b/assets/layers/transit_stops/transit_stops.json
@@ -55,13 +55,6 @@
       "label": "<div style=\"background: white; display: block\">{name}</div>"
     }
   ],
-  "calculatedTags": [
-    "_routes=feat.memberships()",
-    "_contained_routes_properties=feat.memberships().map(p => {return {id: p.relation.id, name: p.relation.properties.name} }).filter((v,i,a)=>a.findIndex(t=>(JSON.stringify(t) === JSON.stringify(v)))===i)",
-    "_contained_route_ids=JSON.parse(feat.properties._contained_routes_properties ?? '[]').map(p => p.id)",
-    "_contained_routes=JSON.parse(feat.properties._contained_routes_properties ?? '[]').map(p => `<li><a href='#relation/${p.id}'>${p.name ?? 'bus route'}</a></li>`).join('')",
-    "_contained_routes_count=JSON.parse(feat.properties._contained_routes_properties ?? '[]').length"
-  ],
   "tagRenderings": [
     {
       "id": "stop_name",
diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json
index e139cc7e9a..f02d60ce40 100644
--- a/assets/themes/climbing/climbing.json
+++ b/assets/themes/climbing/climbing.json
@@ -461,8 +461,12 @@
         ]
       }
     },
-    "drinking_water",
-    "toilet"
+    {
+      "builtin": ["toilet","drinking_water"],
+      "override": {
+        "minzoom": 15
+      }
+    }
   ],
   "credits": "Christian Neumann <christian@utopicode.de>"
-}
\ No newline at end of file
+}