diff --git a/assets/layers/campsite/campsite.json b/assets/layers/campsite/campsite.json
index 18ed6a9b5..6fce4181d 100644
--- a/assets/layers/campsite/campsite.json
+++ b/assets/layers/campsite/campsite.json
@@ -268,7 +268,7 @@
       }
     },
     "caravansites.caravansites-toilets",
-    "toilet_at_amenity.toilets-wheelchair",
+    "toilet_at_amenity_lib.all",
     "questions",
     "mastodon"
   ],
diff --git a/assets/layers/tourism_accomodation/tourism_accomodation.json b/assets/layers/tourism_accomodation/tourism_accomodation.json
index b5ea6cb22..75885933f 100644
--- a/assets/layers/tourism_accomodation/tourism_accomodation.json
+++ b/assets/layers/tourism_accomodation/tourism_accomodation.json
@@ -407,7 +407,7 @@
     "brand",
     "contact",
     "wheelchair-access",
-    "toilet_at_amenity.toilets-wheelchair",
+    "toilet_at_amenity_lib.all",
     "internet-all",
     "dog-access"
   ],
diff --git a/assets/themes/hotels/hotels.json b/assets/themes/hotels/hotels.json
index 0e6da3758..20d4c5d5b 100644
--- a/assets/themes/hotels/hotels.json
+++ b/assets/themes/hotels/hotels.json
@@ -48,7 +48,8 @@
         "love_hotel"
       ],
       "override": {
-        "minzoom": 18
+        "minzoom": 18,
+        "enableMorePrivacy": false
       }
     }
   ]