Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 8006)
+++ /trunk/data/defaultpresets.xml	(revision 8007)
@@ -141,5 +141,5 @@
         <reference ref="internet" />
         <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-        <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+        <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
     </chunk>
     <chunk id="optional_height">
@@ -866,5 +866,5 @@
                 <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,use_sidepath,no" />
                 <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" />
-                <combo key="wheelchair" text="Wheelchairs" values="unknown,yes,official,no" />
+                <combo key="wheelchair" text="Wheelchairs" values="yes,designated,limited,no" />
                 <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" />
                 <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,private,no" />
@@ -1401,5 +1401,5 @@
             <key key="barrier" value="kerb" />
             <reference ref="optional_height" />
-            <combo key="wheelchair" text="Wheelchairs" values="no,limited,yes" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
         </item> <!-- Kerb -->
         <separator/> <!-- *** Access *** -->
@@ -2713,5 +2713,5 @@
             <check key="shelter" text="Shelter" />
             <check key="covered" text="Covered" />
-            <combo key="wheelchair" text="Wheelchair" values="yes,no,limited,only" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
             <optional>
                 <text key="ref" text="Reference" />
@@ -2761,5 +2761,5 @@
             <optional>
                 <text key="name" text="Name" />
-                <check key="wheelchair" text="Wheelchair" />
+                <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
                 <check key="bicycle" text="Bicycle" />
             </optional>
@@ -3282,6 +3282,5 @@
             <reference ref="name_operator_oh" />
             <space />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <reference ref="internet_smoking_wheelchair" />
             <space />
             <reference ref="contact" />
@@ -3465,5 +3464,5 @@
             <key key="amenity" value="cinema" />
             <reference ref="name_operator_oh" />
-            <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
             <check key="drive_in" text="Drive-in theater" />
             <check key="cinema:3D" text="3D" />
@@ -3564,6 +3563,5 @@
             <reference ref="name_operator_oh" />
             <space />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <reference ref="internet_smoking_wheelchair" />
             <space />
             <reference ref="contact" />
@@ -4153,5 +4151,5 @@
             <reference ref="name_operator_oh" />
             <combo key="dispensing" text="Dispensing" values="yes,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="no,limited,yes" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
             <reference ref="link_contact" />
         </item> <!-- Pharmacy -->
@@ -4235,5 +4233,5 @@
                 <text key="operator" text="Operator" />
                 <combo key="toilets:position" text="Usage Position" values="seated,seated;urinal,squat,urinal" />
-                <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" />
+                <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
             </optional>
         </item> <!-- Toilets/Restrooms -->
@@ -4248,5 +4246,5 @@
                 <combo key="fee" text="Fee" values="yes,no" />
                 <text key="operator" text="Operator" />
-                <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" />
+                <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
                 <reference ref="oh" />
             </optional>
@@ -5001,5 +4999,5 @@
             <combo key="entrance" text="Entrance" values="yes,main,service,exit,emergency" values_context="entrance" default="yes" match="key" />
             <combo key="access" text="Access" values="yes,delivery,private,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no,limited" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
             <optional>
                 <text key="ref" text="Entrance number" />