diff --git a/data/editor.config b/data/editor.config
index 7374011bbd..a565aec958 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -557,6 +557,10 @@
         <include group="poi_internet" />
         <include field="wikipedia" />
       </type>
+
+      <!-- Do not allow to edit settlements.
+           It is not just about editing names, because of the complex OSM address scheme.
+           Editing wiki is also not convenient now.
       <type id="place-hamlet" can_add="no">
         <include field="name" />
         <include field="wikipedia" />
@@ -565,19 +569,26 @@
         <include field="name" />
         <include field="wikipedia" />
       </type>
-      <type id="railway-halt" editable="no" can_add="no">
+      -->
+
+      <!-- Do not allow to edit major railways.
+           Comment these types at all instead of editable=no.
+      <type id="railway-halt" can_add="no">
         <include field="name" />
       </type>
-      <type id="railway-station" editable="no" can_add="no">
+      <type id="railway-station" can_add="no">
         <include group="poi_internet" />
       </type>
-      <type id="railway-subway_entrance" editable="no" can_add="no">
+      <type id="railway-subway_entrance" can_add="no">
         <include field="name" />
       </type>
-      <!-- Tram stops should be inside tram lines, which our editor cannot do. -->
+      -->
+
+      <!-- Tram stops should be inside tram lines, so can_add=no. -->
       <type id="railway-tram_stop" can_add="no">
         <include field="name" />
       </type>
+
       <type id="shop" can_add="no">
         <include group="poi_internet" />
       </type>