diff --git a/data/editor.config b/data/editor.config
index ca4c1e745..015cd03e6 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -394,32 +394,25 @@
       <type id="amenity-pharmacy" group="shop">
         <include group="poi_internet" />
       </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-buddhist" can_add="no">
+      <type id="amenity-place_of_worship-buddhist">
         <include group="poi_internet" />
       </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-christian" can_add="no">
+      <type id="amenity-place_of_worship-christian">
         <include group="poi_internet" />
       </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-hindu" can_add="no">
+      <type id="amenity-place_of_worship-hindu">
         <include group="poi_internet" />
       </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-jewish" can_add="no">
+      <type id="amenity-place_of_worship-jewish">
         <include group="poi_internet" />
       </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-muslim" can_add="no">
+      <type id="amenity-place_of_worship-muslim">
         <include group="poi_internet" />
       </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-shinto" can_add="no">
+      <type id="amenity-place_of_worship-shinto">
         <include group="poi_internet" />
       </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-taoist" can_add="no">
+      <type id="amenity-place_of_worship-taoist">
         <include group="poi_internet" />
       </type>
       <type id="amenity-place_of_worship">
@@ -705,6 +698,18 @@
       <type id="leisure-resort">
         <include group="poi_internet" />
       </type>
+      <type id="leisure-sports_centre-sport-climbing">
+        <include group="poi_internet" />
+      </type>
+      <type id="leisure-sports_centre-sport-swimming">
+        <include group="poi_internet" />
+      </type>
+      <type id="leisure-sports_centre-sport-yoga">
+        <include group="poi_internet" />
+      </type>
+      <type id="leisure-sports_centre-sport-shooting">
+        <include group="poi_internet" />
+      </type>
       <type id="leisure-sports_centre">
         <include group="poi_internet" />
       </type>
@@ -1115,6 +1120,7 @@
       <type id="tourism-artwork">
         <include field="name" />
       </type>
+      <!-- Not addable because OSM category is too broad and due to vandalism problems -->
       <type id="tourism-attraction" can_add="no">
         <include group="poi_internet" />
 <!--        <include field="wikipedia" />-->
@@ -1144,26 +1150,22 @@
         <include group="poi_internet" />
         <include field="self_service" />
       </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-office" can_add="no">
+      <type id="tourism-information-office">
         <include group="poi_internet" />
       </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-visitor_centre" can_add="no">
+      <type id="tourism-information-visitor_centre">
         <include group="poi_internet" />
       </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-board" can_add="no">
+      <type id="tourism-information-board">
         <include field="name" />
       </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-map" can_add="no">
+      <type id="tourism-information-map">
         <include field="name" />
       </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-guidepost" can_add="no">
+      <type id="tourism-information-guidepost">
       </type>
-      <type id="tourism-information">
+      <!-- Too generic to add -->
+      <type id="tourism-information" can_add="no">
         <include group="poi" />
       </type>
       <type id="amenity-ranger_station">
@@ -1509,67 +1511,50 @@
       <type id="leisure-escape_game">
         <include group="poi_internet" />
       </type>
-      <!-- Uncomment this after our editor core supports complex types
+      <type id="amenity-vending_machine-parking_tickets">
+        <include field="operator" />
+        <include field="level" />
+      </type>
+      <type id="amenity-vending_machine-public_transport">
+        <include field="operator" />
+        <include field="level" />
+      </type>
       <type id="amenity-vending_machine-cigarettes">
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="cigarettes" />
-        <include field="operator" />
-      </type>
-      <type id="amenity-vending_machine-coffee">
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="coffee" />
-        <include field="operator" />
-      </type>
-      <type id="amenity-vending_machine-condoms">
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="condoms" />
         <include field="operator" />
+        <include field="level" />
       </type>
       <type id="amenity-vending_machine-drinks">
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="drinks" />
         <include field="operator" />
+        <include field="level" />
+      </type>
+      <type id="amenity-vending_machine-excrement_bags">
+        <include field="operator" />
+        <include field="level" />
+      </type>
+      <type id="amenity-vending_machine-coffee">
+        <include field="operator" />
+        <include field="level" />
+      </type>
+      <type id="amenity-vending_machine-condoms">
+        <include field="operator" />
+        <include field="level" />
       </type>
       <type id="amenity-vending_machine-food">
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="food" />
         <include field="operator" />
+        <include field="level" />
       </type>
       <type id="amenity-vending_machine-newspapers">
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="newspapers" />
         <include field="operator" />
+        <include field="level" />
       </type>
       <type id="amenity-vending_machine-sweets">
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="sweets" />
         <include field="operator" />
+        <include field="level" />
       </type>
-      <type id="shop-car_repair-tyres">
-        <tag k="shop" v="car_repair" />
-        <tag k="service" v="tyres" />
-        <include group="poi_internet" />
+      <type id="amenity-vending_machine">
+        <include field="operator" />
+        <include field="level" />
       </type>
-      <type id="leisure-sports_centre-climbing">
-        <tag k="leisure" v="sports_centre" />
-        <tag k="sport" v="climbing" />
-        <include group="poi_internet" />
-      </type>
-      <type id="leisure-sports_centre-shooting">
-        <tag k="leisure" v="sports_centre" />
-        <tag k="sport" v="shooting" />
-        <include group="poi_internet" />
-      </type>
-      <type id="leisure-sports_centre-swimming">
-        <tag k="leisure" v="sports_centre" />
-        <tag k="sport" v="swimming" />
-        <include group="poi_internet" />
-      </type>
-      <type id="leisure-sports_centre-yoga">
-        <tag k="leisure" v="sports_centre" />
-        <tag k="sport" v="yoga" />
-        <include group="poi_internet" />
-      </type-->
       <!-- Not addable as mapping as a node is uncommon -->
       <type id="natural-beach" can_add="no">
         <include field="name" />