diff --git a/data/editor.config b/data/editor.config
index efd5930e58..c9d1273757 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -142,6 +142,7 @@
       <type id="amenity-bank" group="banking">
         <include group="poi" />
         <include field="operator" />
+        <include field="atm" />
       </type>
       <type id="amenity-bar" group="food">
         <include group="poi" />
@@ -156,6 +157,7 @@
       <type id="amenity-bureau_de_change" group="banking">
         <include group="poi" />
         <include field="operator" />
+        <include field="atm" />
       </type>
       <type id="amenity-bus_station">
         <include group="poi" />
@@ -173,7 +175,7 @@
         <include field="operator" />
         <include field="internet" />
       </type>
-      <type id="amenity-car_sharing">
+      <type id="amenity-car_sharing" can_add="no">
         <include group="poi" />
         <include field="operator" />
         <include field="website" />
@@ -197,7 +199,7 @@
         <include group="poi" />
         <include field="operator" />
       </type>
-      <type id="amenity-doctors" group="health">
+      <type id="amenity-doctors" group="health" can_add="no">
         <include group="poi" />
         <include field="internet" />
       </type>
@@ -335,31 +337,31 @@
       <type id="craft" can_add="no">
         <include group="poi" />
       </type>
-      <type id="craft-brewery" group="shop">
+      <type id="craft-brewery" group="shop" can_add="no">
         <include group="poi" />
       </type>
-      <type id="craft-carpenter">
+      <type id="craft-carpenter" can_add="no">
         <include group="poi" />
       </type>
-      <type id="craft-electrician">
+      <type id="craft-electrician" can_add="no">
         <include group="poi" />
       </type>
-      <type id="craft-gardener">
+      <type id="craft-gardener" can_add="no">
         <include group="poi" />
       </type>
-      <type id="craft-hvac" group="shop">
+      <type id="craft-hvac" group="shop" can_add="no">
         <include group="poi" />
       </type>
-      <type id="craft-metal_construction">
+      <type id="craft-metal_construction" can_add="no">
         <include group="poi" />
       </type>
-      <type id="craft-painter">
+      <type id="craft-painter" can_add="no">
         <include group="poi" />
       </type>
-      <type id="craft-photographer">
+      <type id="craft-photographer" can_add="no">
         <include group="poi" />
       </type>
-      <type id="craft-plumber">
+      <type id="craft-plumber" can_add="no">
         <include group="poi" />
       </type>
       <type id="craft-shoemaker">
@@ -376,7 +378,7 @@
         <include group="poi" />
         <include field="wikipedia" />
       </type>
-      <type id="historic-castle" group="historic" can_add="no">
+      <type id="historic-castle" group="historic">
         <include group="poi" />
         <include field="wikipedia" />
       </type>
@@ -431,7 +433,7 @@
         <include group="poi" />
         <include field="internet" />
       </type>
-      <type id="office-company" group="office">
+      <type id="office-company" group="office" can_add="no">
         <include group="poi" />
       </type>
       <type id="office-government" group="office">
@@ -468,7 +470,8 @@
         <include field="name" />
         <include field="operator" />
       </type>
-      <type id="railway-tram_stop" editable="no">
+      <!-- Tram stops should be inside tram lines, which our editor cannot do. -->
+      <type id="railway-tram_stop" can_add="no">
         <include field="name" />
         <include field="operator" />
       </type>
@@ -561,7 +564,7 @@
         <include group="poi" />
         <include field="internet" />
       </type>
-      <type id="shop-garden_centre" group="big_shop">
+      <type id="shop-garden_centre" group="big_shop" can_add="no">
         <include group="poi" />
         <include field="internet" />
       </type>