Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 16381)
+++ trunk/resources/data/defaultpresets.xml	(revision 16382)
@@ -2350,5 +2350,8 @@
             <key key="amenity" value="car_wash" />
             <reference ref="name_brand_operator_oh_wheelchair" />
-            <check key="self_service" text="Self Service" />
+            <checkgroup columns="2">
+                <check key="automated" text="Automated" text_context="car_wash" />
+                <check key="self_service" text="Self Service" />
+            </checkgroup>
             <reference ref="link_contact_address_payment" />
         </item> <!-- Wash -->
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java	(revision 16381)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java	(revision 16382)
@@ -58,5 +58,5 @@
 
     private static final Set<String> KNOWN_SOURCE_MAXSPEED_CONTEXTS = new HashSet<>(Arrays.asList(
-            "urban", "rural", "zone", "zone20", "zone:20", "zone30", "zone:30", "zone40",
+            "urban", "rural", "zone", "zone10", "zone:10", "zone20", "zone:20", "zone30", "zone:30", "zone40", "zone:40", "zone60", "zone:60",
             "nsl_single", "nsl_dual", "motorway", "trunk", "living_street", "bicycle_road"));