Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 18459)
+++ trunk/resources/data/defaultpresets.xml	(revision 18460)
@@ -9105,4 +9105,5 @@
             <space />
             <text key="addr:housenumber" text="House number" match="key" auto_increment="-2,-1,+1,+2" />
+            <check key="nohousenumber" text="House has no house number" disable_off="true"/>
             <text key="addr:street" text="Street name" use_last_as_default="force" match="key" alternative_autocomplete_keys="name" />
             <optional>
Index: trunk/resources/data/validator/combinations.mapcss
===================================================================
--- trunk/resources/data/validator/combinations.mapcss	(revision 18459)
+++ trunk/resources/data/validator/combinations.mapcss	(revision 18460)
@@ -286,5 +286,5 @@
 }
 
-/* {0.tag} together with {1.key}, see #17664, #17707, #16464, #10837, #14034, #9389, #11977, #13156, #16888, #20530, #21736 */
+/* {0.tag} together with {1.key}, see #17664, #17707, #16464, #10837, #14034, #9389, #11977, #13156, #16888, #20530, #21736, #22076 */
 *[power=plant][/^generator:/],
 *[power=generator][/^plant:/],
@@ -296,4 +296,6 @@
 *[amenity=vending_machine][shop],
 *[noname?][name],
+*[noref?][ref],
+*[nohousenumber?][addr:housenumber],
 *[actuator][handle][actuator !~ /(^|;)manual(;|$)/],
 *[mechanical_driver][handle][mechanical_driver !~ /(^|;)manual(;|$)/],