Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 8121)
+++ trunk/data/defaultpresets.xml	(revision 8122)
@@ -2937,7 +2937,7 @@
             <optional>
                 <text key="name" text="Name" />
-                <combo key="shelter" text="Shelter" values="yes,no" />
-                <combo key="bench" text="Bench" values="yes,no" />
-                <combo key="tactile_paving" text="Tactile Paving" values="yes,no" />
+                <check key="shelter" text="Shelter" />
+                <check key="bench" text="Bench" />
+                <combo key="tactile_paving" text="Tactile Paving" values="yes,no,incorrect" />
             </optional>
         </item> <!-- Bus Stop -->
@@ -4242,5 +4242,5 @@
             <key key="amenity" value="pharmacy" />
             <reference ref="name_operator_oh_wheelchair" />
-            <combo key="dispensing" text="Dispensing" values="yes,no" />
+            <check key="dispensing" text="Dispensing"/>
             <reference ref="link_contact_address_payment" />
         </item> <!-- Pharmacy -->
@@ -4476,5 +4476,5 @@
             <space />
             <key key="amenity" value="bench" />
-            <combo key="backrest" text="Backrest" values="yes,no" />
+            <check key="backrest" text="Backrest" />
             <combo key="material" text="Material" values="stone,metal,wood,plastic" />
             <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
@@ -4505,7 +4505,7 @@
             <key key="amenity" value="hunting_stand" />
             <combo key="height" text="Height" values="low,half,full,5,10,15,20" values_context="height" />
-            <combo key="shelter" text="Shelter" values="yes,no" />
-            <combo key="hide" text="Hide" values="yes,no" />
-            <combo key="lock" text="Lock" values="yes,no" />
+            <check key="shelter" text="Shelter" />
+            <check key="hide" text="Hide" />
+            <check key="lock" text="Lock" />
         </item> <!-- Hunting Stand -->
         <separator/>
@@ -5196,5 +5196,5 @@
             <text key="operator" text="Operator" />
             <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
-            <combo key="headframe" text="Visible Headframe" values="yes,no" />
+            <check key="headframe" text="Visible Headframe" />
             <check key="disused" text="Disused" />
         </item> <!-- Mineshaft -->
@@ -6659,5 +6659,5 @@
             <key key="shop" value="medical_supply" />
             <reference ref="name_operator_oh_wheelchair" />
-            <combo key="dispensing" text="Dispensing" values="yes,no" />
+            <check key="dispensing" text="Dispensing" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Medical Supply -->