diff --git a/data/editor.config b/data/editor.config
index 40fa16a3d..0b82f3c89 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -389,6 +389,34 @@
       <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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">
+        <include group="poi_internet" />
+      </type>
       <type id="amenity-place_of_worship">
         <include group="poi_internet" />
       </type>
@@ -1112,6 +1140,25 @@
         <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">
+        <include group="poi_internet" />
+      </type>
+      <!-- Can not be added because it is a complex type -->
+      <type id="tourism-information-visitor_centre" can_add="no">
+        <include group="poi_internet" />
+      </type>
+      <!-- Can not be added because it is a complex type -->
+      <type id="tourism-information-board" can_add="no">
+        <include field="name" />
+      </type>
+      <!-- Can not be added because it is a complex type -->
+      <type id="tourism-information-map" can_add="no">
+        <include field="name" />
+      </type>
+      <!-- Can not be added because it is a complex type -->
+      <type id="tourism-information-guidepost" can_add="no">
+      </type>
       <type id="tourism-information">
         <include group="poi" />
       </type>
@@ -1473,19 +1520,6 @@
         <tag k="service" v="tyres" />
         <include group="poi_internet" />
       </type>
-      <type id="tourism-information-office">
-        <tag k="tourism" v="information" />
-        <tag k="information" v="board" />
-        <include group="poi_internet" />
-      </type>
-      <type id="tourism-information-board">
-        <tag k="tourism" v="information" />
-        <tag k="information" v="board" />
-      </type>
-      <type id="tourism-information-map">
-        <tag k="tourism" v="information" />
-        <tag k="information" v="board" />
-      </type>
       <type id="leisure-sports_centre-climbing">
         <tag k="leisure" v="sports_centre" />
         <tag k="sport" v="climbing" />