diff --git a/data/editor.config b/data/editor.config
index ce667ff45..fe7403ee0 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -226,6 +226,7 @@
       <type id="amenity-atm" group="banking" priority="low">
         <include field="opening_hours" />
         <include field="operator" />
+        <include field="level" />
       </type>
       <type id="amenity-bank" group="banking">
         <include group="poi_internet" />
@@ -294,6 +295,7 @@
       <type id="amenity-drinking_water">
         <include field="name" />
         <include field="operator" />
+        <include field="level" />
       </type>
       <type id="office-diplomatic">
         <include group="poi_internet" />
@@ -350,6 +352,7 @@
       <type id="amenity-parcel_locker">
         <include field="operator" />
         <include field="postcode" />
+        <include field="level" />
       </type>
       <type id="shop-outpost">
         <include group="poi" />
@@ -430,6 +433,7 @@
       </type>
       <type id="amenity-toilets">
         <include field="opening_hours" />
+        <include field="level" />
       </type>
       <type id="amenity-townhall">
         <include group="poi_internet" />
@@ -1103,9 +1107,12 @@
       <type id="amenity-bbq" />
       <type id="amenity-shelter">
         <include field="name" />
-        <include field="internet" />
       </type>
-      <type id="amenity-luggage_locker" />
+      <type id="amenity-luggage_locker">
+        <include field="operator" />
+        <include field="opening_hours" />
+        <include field="level" />
+      </type>
       <type id="tourism-picnic_site" />
       <type id="leisure-picnic_table" />
       <type id="leisure-park">
@@ -1120,7 +1127,6 @@
       </type>
       <type id="leisure-playground">
         <include field="name" />
-        <include field="internet" />
         <include field="opening_hours" />
       </type>
       <type id="amenity-bicycle_parking">
@@ -1172,9 +1178,12 @@
       </type>
       <type id="amenity-payment_terminal">
         <include field="operator" />
+        <include field="level" />
       </type>
       <type id="amenity-shower">
-        <include group="poi" />
+        <include field="operator" />
+        <include field="opening_hours" />
+        <include field="level" />
       </type>
       <type id="amenity-water_point">
         <include group="address" />
@@ -1223,6 +1232,9 @@
       </type>
 
       <type id="emergency-defibrillator">
+        <include field="operator" />
+        <include field="opening_hours" />
+        <include field="level" />
       </type>
       <type id="emergency-fire_hydrant">
       </type>
@@ -1234,6 +1246,8 @@
       </type>
       <type id="emergency-lifeguard">
         <include field="name" />
+        <include field="operator" />
+        <include field="opening_hours" />
       </type>
       <type id="highway-rest_area">
         <include field="name" />
@@ -1256,9 +1270,7 @@
       <type id="leisure-fitness_centre">
         <include group="poi_internet" />
       </type>
-      <type id="leisure-fitness_station">
-        <include field="internet" />
-      </type>
+      <type id="leisure-fitness_station" />
       <type id="leisure-sauna">
         <include group="poi_internet" />
       </type>
@@ -1479,6 +1491,7 @@
       <type id="man_made-water_tap">
         <include field="name" />
         <include field="operator" />
+        <include field="level" />
       </type>
     </types>
   </editor>