diff --git a/data/categories.txt b/data/categories.txt
index aad8f182ce..16b6b2b871 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -4460,8 +4460,8 @@ sw:Jengo
 
 amenity-police
 en:4Police|U+1F693|U+1F46E|U+1F694|U+1F482|U+1F6A8
-ru:4Милиция|4полиция
-uk:4Міліція|4поліція
+ru:4Полиция|4милиция
+uk:4Поліція|4Міліція
 de:4Polizeistation|Polizeiwache|Polizei
 fr:4Police|4gendarmerie
 it:Posto di polizia|4polizia
diff --git a/data/editor.config b/data/editor.config
index 4226425b04..c6c31da1ba 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -102,6 +102,7 @@
       <field_group name="address">
         <field_ref name="street" />
         <field_ref name="housenumber" />
+        <field_ref name="housename" />
         <field_ref name="postcode" />
       </field_group>
       <field_group name="poi_noname">
@@ -443,7 +444,7 @@
       <type id="natural-spring">
         <include field="name" />
       </type>
-      <type id="natural-waterfall" can_add="no">
+      <type id="waterway-waterfall">
         <include field="name" />
         <include field="height" />
         <include field="wikipedia" />
@@ -864,10 +865,10 @@
         <include field="name" />
       </type>
       <type id="building" can_add="no">
-        <include field="street" />
-        <include field="housename" />
-        <include field="housenumber" />
-        <include field="postcode" />
+        <include group="address" />
+      </type>
+      <type id="building-address" can_add="no">
+        <include group="address" />
       </type>
     </types>