Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 8012)
+++ /trunk/data/defaultpresets.xml	(revision 8013)
@@ -115,22 +115,29 @@
         <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00, Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     </chunk>
-    <chunk id="name_oh">
+    <chunk id="wheelchair">
+        <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
+    </chunk>
+    <chunk id="oh_wheelchair">
+        <reference ref="oh" />
+        <reference ref="wheelchair" />
+    </chunk>
+    <chunk id="name_oh_wheelchair">
         <text key="name" text="Name" />
-        <reference ref="oh" />
+        <reference ref="oh_wheelchair" />
     </chunk>
-    <chunk id="name_operator_oh">
+    <chunk id="name_operator_oh_wheelchair">
         <reference ref="name_operator" />
-        <reference ref="oh" />
+        <reference ref="oh_wheelchair" />
     </chunk>
-    <chunk id="name_brand_operator_oh">
+    <chunk id="name_brand_operator_oh_wheelchair">
         <text key="name" text="Name" />
         <text key="brand" text="Brand" />
         <text key="operator" text="Operator" />
-        <reference ref="oh" />
+        <reference ref="oh_wheelchair" />
     </chunk>
-    <chunk id="name_brand_oh">
+    <chunk id="name_brand_oh_wheelchair">
         <text key="name" text="Name" />
         <text key="brand" text="Brand" />
-        <reference ref="oh" />
+        <reference ref="oh_wheelchair" />
     </chunk>
     <chunk id="internet">
@@ -138,8 +145,7 @@
         <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
     </chunk>
-    <chunk id="internet_smoking_wheelchair">
+    <chunk id="internet_smoking">
         <reference ref="internet" />
         <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-        <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
     </chunk>
     <chunk id="optional_height">
@@ -1421,5 +1427,5 @@
             <key key="barrier" value="kerb" />
             <reference ref="optional_height" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
+            <reference ref="wheelchair" />
         </item> <!-- Kerb -->
         <separator/> <!-- *** Access *** -->
@@ -1911,5 +1917,5 @@
             <optional>
                 <reference ref="supervised" />
-                <reference ref="oh" />
+                <reference ref="oh_wheelchair" />
                 <reference ref="general_access" />
                 <combo key="surface" text="Surface" values="gravel,pebblestone,sand" />
@@ -2404,5 +2410,5 @@
                 <text key="name" text="Name" />
                 <text key="operator" text="Operator" />
-                <reference ref="oh" />
+                <reference ref="oh_wheelchair" />
                 <combo key="shop" text="With shop" values="yes,convenience,kiosk,no" />
                 <label text="Fuel types:" />
@@ -2448,5 +2454,5 @@
             <space />
             <key key="amenity" value="car_wash" />
-            <reference ref="name_brand_operator_oh" />
+            <reference ref="name_brand_operator_oh_wheelchair" />
         </item> <!-- Wash -->
         <separator/>
@@ -2463,5 +2469,5 @@
             <space />
             <key key="shop" value="car" />
-            <reference ref="name_brand_operator_oh" />
+            <reference ref="name_brand_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Car Dealer -->
@@ -2474,5 +2480,5 @@
             <space />
             <key key="shop" value="car_repair" />
-            <reference ref="name_brand_operator_oh" />
+            <reference ref="name_brand_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Repair -->
@@ -2483,5 +2489,5 @@
             <space />
             <key key="shop" value="car_parts" />
-            <reference ref="name_brand_operator_oh" />
+            <reference ref="name_brand_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Parts -->
@@ -2492,5 +2498,5 @@
             <space />
             <key key="shop" value="tyres" />
-            <reference ref="name_brand_operator_oh" />
+            <reference ref="name_brand_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Tires -->
@@ -2506,5 +2512,5 @@
             <space />
             <key key="amenity" value="car_rental" />
-            <reference ref="name_brand_operator_oh" />
+            <reference ref="name_brand_operator_oh_wheelchair" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
             <reference ref="link_contact" />
@@ -2522,5 +2528,5 @@
             <text key="operator" text="Operator" />
             <text key="capacity" text="Capacity" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <text key="website" text="Website" />
         </item> <!-- Sharing -->
@@ -2550,5 +2556,5 @@
             <combo key="brand" text="Brand" values="independent" />
             <text key="operator" text="Operator" />
-            <reference ref="oh" />
+            <reference ref="oh_wheelchair" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
             <optional text="Services:">
@@ -2598,5 +2604,5 @@
             <space />
             <key key="shop" value="bicycle" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <check key="service:bicycle:retail" text="Bicycles are sold" />
             <check key="service:bicycle:second_hand" text="Second-hand bicycles are sold" />
@@ -2631,5 +2637,5 @@
             <key key="amenity" value="bicycle_repair_station" />
             <optional>
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <check key="service:bicycle:pump" text="Free bicycle pump" />
             </optional>
@@ -2733,5 +2739,5 @@
             <check key="shelter" text="Shelter" />
             <check key="covered" text="Covered" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
+            <reference ref="wheelchair" />
             <optional>
                 <text key="ref" text="Reference" />
@@ -2781,5 +2787,5 @@
             <optional>
                 <text key="name" text="Name" />
-                <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
+                <reference ref="wheelchair" />
                 <check key="bicycle" text="Bicycle" />
             </optional>
@@ -3045,6 +3051,7 @@
             <reference ref="name_operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
-            <space />
-            <reference ref="internet_smoking_wheelchair" />
+            <reference ref="wheelchair" />
+            <space />
+            <reference ref="internet_smoking" />
             <space />
             <reference ref="contact" />
@@ -3061,6 +3068,7 @@
             <reference ref="name_operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
-            <space />
-            <reference ref="internet_smoking_wheelchair" />
+            <reference ref="wheelchair" />
+            <space />
+            <reference ref="internet_smoking" />
             <space />
             <reference ref="contact" />
@@ -3076,6 +3084,7 @@
             <reference ref="name_operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
-            <space />
-            <reference ref="internet_smoking_wheelchair" />
+            <reference ref="wheelchair" />
+            <space />
+            <reference ref="internet_smoking" />
             <space />
             <reference ref="contact" />
@@ -3092,6 +3101,7 @@
             <reference ref="name_operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
-            <space />
-            <reference ref="internet_smoking_wheelchair" />
+            <reference ref="wheelchair" />
+            <space />
+            <reference ref="internet_smoking" />
             <space />
             <reference ref="contact" />
@@ -3109,6 +3119,7 @@
             <reference ref="name_operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
-            <space />
-            <reference ref="internet_smoking_wheelchair" />
+            <reference ref="wheelchair" />
+            <space />
+            <reference ref="internet_smoking" />
             <space />
             <reference ref="contact" />
@@ -3126,5 +3137,5 @@
             <text key="ele" text="Elevation" />
             <space />
-            <reference ref="internet_smoking_wheelchair" />
+            <reference ref="internet_smoking" />
             <space />
             <reference ref="contact" />
@@ -3140,6 +3151,7 @@
             <reference ref="name_operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
-            <space />
-            <reference ref="internet_smoking_wheelchair" />
+            <reference ref="wheelchair" />
+            <space />
+            <reference ref="internet_smoking" />
             <space />
             <text key="capacity" text="Number of places" />
@@ -3163,6 +3175,7 @@
             <reference ref="name_operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
-            <space />
-            <reference ref="internet_smoking_wheelchair" />
+            <reference ref="wheelchair" />
+            <space />
+            <reference ref="internet_smoking" />
             <space />
             <reference ref="contact" />
@@ -3183,8 +3196,8 @@
             <multiselect key="cuisine" text="Cuisine" values="italian;chinese;pizza;burger;greek;german;indian;regional;kebab;turkish;asian;thai;mexican;japanese;french;sandwich;sushi" values_searchable="true" />
             <check key="microbrewery" text="Microbrewery" />
-            <reference ref="oh" />
+            <reference ref="oh_wheelchair" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
             <space />
-            <reference ref="internet_smoking_wheelchair" />
+            <reference ref="internet_smoking" />
             <space />
             <reference ref="contact" />
@@ -3200,7 +3213,7 @@
             <reference ref="name_operator" />
             <combo key="cuisine" text="Cuisine" values="italian,chinese,pizza,burger,greek,german,indian,regional,kebab,turkish,asian,thai,mexican,japanese,french,sandwich,sushi,fish_and_chips,chicken" />
-            <reference ref="oh" />
-            <space />
-            <reference ref="internet_smoking_wheelchair" />
+            <reference ref="oh_wheelchair" />
+            <space />
+            <reference ref="internet_smoking" />
             <space />
             <reference ref="contact" />
@@ -3213,7 +3226,7 @@
             <space />
             <key key="amenity" value="food_court" />
-            <reference ref="name_operator_oh" />
-            <space />
-            <reference ref="internet_smoking_wheelchair" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <space />
+            <reference ref="internet_smoking" />
             <space />
             <reference ref="contact" />
@@ -3233,7 +3246,7 @@
             <reference ref="name_operator" />
             <combo key="cuisine" text="Cuisine" values="ice_cream" />
-            <reference ref="oh" />
-            <space />
-            <reference ref="internet_smoking_wheelchair" />
+            <reference ref="oh_wheelchair" />
+            <space />
+            <reference ref="internet_smoking" />
             <space />
             <reference ref="contact" />
@@ -3249,7 +3262,7 @@
             <reference ref="name_operator" />
             <check key="microbrewery" text="Microbrewery" />
-            <reference ref="oh" />
-            <space />
-            <reference ref="internet_smoking_wheelchair" />
+            <reference ref="oh_wheelchair" />
+            <space />
+            <reference ref="internet_smoking" />
             <space />
             <reference ref="contact" />
@@ -3265,7 +3278,7 @@
             <reference ref="name_operator" />
             <check key="microbrewery" text="Microbrewery" />
-            <reference ref="oh" />
-            <space />
-            <reference ref="internet_smoking_wheelchair" />
+            <reference ref="oh_wheelchair" />
+            <space />
+            <reference ref="internet_smoking" />
             <space />
             <reference ref="contact" />
@@ -3282,7 +3295,7 @@
             <space />
             <key key="amenity" value="bar" />
-            <reference ref="name_operator_oh" />
-            <space />
-            <reference ref="internet_smoking_wheelchair" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <space />
+            <reference ref="internet_smoking" />
             <space />
             <reference ref="contact" />
@@ -3300,7 +3313,7 @@
             <space />
             <key key="amenity" value="nightclub" />
-            <reference ref="name_operator_oh" />
-            <space />
-            <reference ref="internet_smoking_wheelchair" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <space />
+            <reference ref="internet_smoking" />
             <space />
             <reference ref="contact" />
@@ -3314,7 +3327,7 @@
             <space />
             <key key="amenity" value="stripclub" />
-            <reference ref="name_operator_oh" />
-            <space />
-            <reference ref="internet_smoking_wheelchair" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <space />
+            <reference ref="internet_smoking" />
             <space />
             <reference ref="contact" />
@@ -3328,5 +3341,5 @@
             <space />
             <key key="tourism" value="attraction" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
         </item> <!-- Attraction -->
         <item name="Viewpoint" icon="styles/standard/sightseeing/viewpoint.png" type="node,closedway" preset_name_label="true">
@@ -3356,5 +3369,5 @@
             <key key="tourism" value="information" />
             <key key="information" value="office" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="internet" />
             <reference ref="link_contact" />
@@ -3433,4 +3446,5 @@
             <key key="information" value="terminal" />
             <reference ref="name_operator" />
+            <reference ref="wheelchair" />
             <text key="description" text="Closer description" />
             <text key="ref" text="Reference number" />
@@ -3450,4 +3464,5 @@
             <key key="information" value="audioguide" />
             <reference ref="name_operator" />
+            <reference ref="wheelchair" />
             <text key="description" text="Closer description" />
             <text key="ref" text="Reference number" />
@@ -3483,6 +3498,5 @@
             <space />
             <key key="amenity" value="cinema" />
-            <reference ref="name_operator_oh" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
+            <reference ref="name_operator_oh_wheelchair" />
             <check key="drive_in" text="Drive-in theater" />
             <check key="cinema:3D" text="3D" />
@@ -3500,5 +3514,5 @@
             <space />
             <key key="tourism" value="zoo" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <text key="wikipedia" text="Wikipedia" />
             <space />
@@ -3520,5 +3534,5 @@
             <check key="area" text="Area" />
             <combo key="barrier" text="Barrier" values="fence,wall" />
-            <reference ref="oh" />
+            <reference ref="oh_wheelchair" />
             <check key="lit" text="Lit" />
         </item> <!-- Dog Park -->
@@ -3530,5 +3544,5 @@
             <space />
             <key key="tourism" value="theme_park" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <space />
             <reference ref="contact" />
@@ -3544,5 +3558,5 @@
             <space />
             <key key="leisure" value="water_park" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <space />
             <reference ref="contact" />
@@ -3555,7 +3569,5 @@
             <space />
             <key key="leisure" value="sauna" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <reference ref="oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <combo key="access" text="Access" values="yes,permissive,private,unknown" />
             <space />
@@ -3566,5 +3578,5 @@
             <space />
             <key key="leisure" value="horse_riding" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="fee" />
             <space />
@@ -3581,7 +3593,7 @@
             <space />
             <key key="amenity" value="brothel" />
-            <reference ref="name_operator_oh" />
-            <space />
-            <reference ref="internet_smoking_wheelchair" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <space />
+            <reference ref="internet_smoking" />
             <space />
             <reference ref="contact" />
@@ -3675,5 +3687,5 @@
             <space />
             <key key="tourism" value="museum" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <text key="wikipedia" text="Wikipedia" />
             <reference ref="link_contact" />
@@ -3689,4 +3701,5 @@
             <key key="amenity" value="theatre" />
             <reference ref="name_operator" />
+            <reference ref="wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Theatre -->
@@ -3702,5 +3715,5 @@
             <space />
             <key key="amenity" value="library" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Library -->
@@ -3741,4 +3754,5 @@
             <key key="amenity" value="studio" />
             <reference ref="name_operator" />
+            <reference ref="wheelchair" />
             <combo key="type" text="Type" values="audio,video" />
             <reference ref="link_contact" />
@@ -3768,5 +3782,5 @@
             <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,greek_catholic,greek_orthodox,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,orthodox,pentecostal,presbyterian,protestant,quaker,roman_catholic,russian_orthodox,seventh_day_adventist" values_context="christian" values_searchable="true" />
             <reference ref="service_times" />
-            <reference ref="oh" />
+            <reference ref="oh_wheelchair" />
         </item> <!-- Church -->
         <item name="Mosque" icon="styles/standard/religion/muslim.png" type="node,closedway,relation" preset_name_label="true">
@@ -3791,5 +3805,5 @@
             <combo key="denomination" text="Denomination" values="ibadi,shia,sunni" values_searchable="true" />
             <reference ref="service_times" />
-            <reference ref="oh" />
+            <reference ref="oh_wheelchair" />
         </item> <!-- Mosque -->
         <item name="Synagogue" icon="styles/standard/religion/jewish.png" type="node,closedway,relation" preset_name_label="true">
@@ -3814,5 +3828,5 @@
             <combo key="denomination" text="Denomination" values="orthodox,conservative,reform" values_context="jewish" values_searchable="true" />
             <reference ref="service_times" />
-            <reference ref="oh" />
+            <reference ref="oh_wheelchair" />
         </item> <!-- Synagogue -->
         <item name="Buddhist Temple" icon="styles/standard/religion/buddhism.png" type="node,closedway,relation" preset_name_label="true">
@@ -3836,5 +3850,5 @@
             <combo key="denomination" text="Denomination" values="theravada,mahayana,vajrayana" values_searchable="true" />
             <reference ref="service_times" />
-            <reference ref="oh" />
+            <reference ref="oh_wheelchair" />
         </item> <!-- Buddhist Temple -->
         <item name="Hindu Temple" icon="styles/standard/religion/hinduism.png" type="node,closedway,relation" preset_name_label="true">
@@ -3858,5 +3872,5 @@
             <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
             <reference ref="service_times" />
-            <reference ref="oh" />
+            <reference ref="oh_wheelchair" />
         </item> <!-- Hindu Temple -->
         <item name="Shinto Shrine" icon="styles/standard/religion/shinto.png" type="node,closedway,relation" preset_name_label="true">
@@ -3879,5 +3893,5 @@
             <text key="name" text="Name" />
             <reference ref="service_times" />
-            <reference ref="oh" />
+            <reference ref="oh_wheelchair" />
         </item> <!-- Shinto Shrine -->
         <item name="Other Place of Worship" icon="styles/standard/religion.png" type="node,closedway,relation" preset_name_label="true">
@@ -3900,5 +3914,5 @@
             <combo key="religion" text="Religion" values="bahai,jain,sikh,spiritualist,taoist,unitarian,zoroastrian" match="keyvalue!" values_searchable="true" />
             <reference ref="service_times" />
-            <reference ref="oh" />
+            <reference ref="oh_wheelchair" />
         </item> <!-- Other Place of Worship -->
     </group> <!-- Place of Worship -->
@@ -3911,5 +3925,5 @@
             <space />
             <key key="amenity" value="public_building" />
-            <text key="name" text="Name" />
+            <reference ref="name_oh_wheelchair" />
         </item> <!-- Public Building -->
         <item name="Town Hall" icon="presets/townhall.png" type="node,closedway,relation" preset_name_label="true">
@@ -3923,5 +3937,5 @@
             <space />
             <key key="amenity" value="townhall" />
-            <text key="name" text="Name" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Town Hall -->
@@ -3936,5 +3950,5 @@
             <space />
             <key key="amenity" value="community_centre" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
         </item> <!-- Community Centre -->
         <item name="Embassy" icon="presets/embassy.png" type="node,closedway,relation" preset_name_label="true">
@@ -3948,5 +3962,5 @@
             <space />
             <key key="amenity" value="embassy" />
-            <text key="name" text="Name" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Embassy -->
@@ -3960,5 +3974,5 @@
             <space />
             <key key="amenity" value="courthouse" />
-            <text key="name" text="Name" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Courthouse -->
@@ -3986,5 +4000,5 @@
             <space />
             <key key="amenity" value="police" />
-            <text key="name" text="Name" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Police -->
@@ -4015,5 +4029,5 @@
             <space />
             <key key="amenity" value="post_office" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <text key="ref" text="Reference" />
         </item> <!-- Post Office -->
@@ -4030,5 +4044,5 @@
             <space />
             <key key="amenity" value="kindergarten" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Kindergarten -->
@@ -4046,5 +4060,5 @@
             <space />
             <key key="amenity" value="school" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- School -->
@@ -4061,5 +4075,5 @@
             <space />
             <key key="amenity" value="university" />
-            <reference ref="name_operator" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- University -->
@@ -4073,5 +4087,5 @@
             <space />
             <key key="amenity" value="college" />
-            <reference ref="name_operator" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- College -->
@@ -4082,5 +4096,5 @@
             <space />
             <key key="amenity" value="driving_school" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <combo key="license_classes" text="License Classes" values="A;A1;B;BE;C,A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E" />
             <reference ref="link_contact" />
@@ -4118,5 +4132,5 @@
             <space />
             <key key="amenity" value="doctors" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Doctor's Office -->
@@ -4128,5 +4142,5 @@
             <space />
             <key key="amenity" value="dentist" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Dentist -->
@@ -4169,7 +4183,6 @@
             <space />
             <key key="amenity" value="pharmacy" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <combo key="dispensing" text="Dispensing" values="yes,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
             <reference ref="link_contact" />
         </item> <!-- Pharmacy -->
@@ -4180,5 +4193,5 @@
             <space />
             <key key="shop" value="hearing_aids" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Hearing Aids -->
@@ -4197,6 +4210,5 @@
             <space />
             <key key="amenity" value="baby_hatch" />
-            <text key="operator" text="Operator" />
-            <reference ref="oh" />
+            <reference ref="name_operator_oh_wheelchair" />
         </item> <!-- Baby Hatch/Safe Haven -->
         <separator/>
@@ -4229,5 +4241,5 @@
             <space />
             <key key="amenity" value="veterinary" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Veterinary -->
@@ -4253,5 +4265,5 @@
                 <text key="operator" text="Operator" />
                 <combo key="toilets:position" text="Usage Position" values="seated,seated;urinal,squat,urinal" />
-                <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
+                <reference ref="wheelchair" />
             </optional>
         </item> <!-- Toilets/Restrooms -->
@@ -4266,6 +4278,5 @@
                 <combo key="fee" text="Fee" values="yes,no" />
                 <text key="operator" text="Operator" />
-                <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
-                <reference ref="oh" />
+                <reference ref="oh_wheelchair" />
             </optional>
         </item> <!-- Shower -->
@@ -4326,5 +4337,5 @@
             <space />
             <key key="emergency" value="defibrillator" />
-            <reference ref="oh" />
+            <reference ref="oh_wheelchair" />
             <text  key="operator" text="Operator" />
             <check key="indoor" text="Located inside a building?" />
@@ -4568,5 +4579,5 @@
             <space />
             <key key="leisure" value="golf_course" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
         </item> <!-- Golf Course -->
         <item name="Miniature Golf" icon="styles/standard/sport/miniature_golf.svg" type="node,closedway" preset_name_label="true">
@@ -4577,5 +4588,5 @@
             <space />
             <key key="leisure" value="miniature_golf" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
         </item> <!-- Miniature Golf -->
     </group> <!-- Sport Facilities -->
@@ -5019,5 +5030,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,limited,no" />
+            <reference ref="wheelchair" />
             <optional>
                 <text key="ref" text="Entrance number" />
@@ -5791,5 +5802,5 @@
             <space />
             <key key="historic" value="ruins" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
         </item> <!-- Ruins -->
         <item name="Archaeological Site" icon="styles/standard/sightseeing/archaeological.png" type="node,closedway" preset_name_label="true">
@@ -5802,5 +5813,5 @@
             <space />
             <key key="historic" value="archaeological_site" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
         </item> <!-- Archaeological Site -->
         <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway" preset_name_label="true">
@@ -5905,5 +5916,5 @@
             <space />
             <key key="shop" value="supermarket" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Supermarket -->
@@ -5918,5 +5929,5 @@
             <space />
             <key key="shop" value="convenience" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Convenience Store -->
@@ -5931,5 +5942,5 @@
             <space />
             <key key="shop" value="kiosk" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Kiosk -->
@@ -5948,5 +5959,5 @@
             <space />
             <key key="shop" value="bakery" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Bakery -->
@@ -5962,5 +5973,5 @@
             <space />
             <key key="shop" value="butcher" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Butcher -->
@@ -5972,5 +5983,5 @@
             <space />
             <key key="shop" value="seafood" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Seafood -->
@@ -5984,5 +5995,5 @@
             <space />
             <key key="shop" value="deli" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Deli (Fine Food) -->
@@ -5999,5 +6010,5 @@
             <space />
             <key key="shop" value="confectionery" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Candy Store -->
@@ -6007,5 +6018,5 @@
             <space />
             <key key="shop" value="tea" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Tea -->
@@ -6014,5 +6025,5 @@
             <space />
             <key key="shop" value="coffee" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Coffee -->
@@ -6030,5 +6041,5 @@
             <space />
             <key key="amenity" value="marketplace" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <text key="website" text="Website" />
             <combo key="organic" text="Organic" values="only,yes,no" />
@@ -6044,5 +6055,5 @@
             <space />
             <key key="shop" value="greengrocer" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <combo key="organic" text="Organic" values="only,yes,no" />
             <reference ref="link_contact" />
@@ -6056,5 +6067,5 @@
             <space />
             <key key="shop" value="farm" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <text key="description" text="Description" />
             <combo key="organic" text="Organic" values="only,yes,no" />
@@ -6085,5 +6096,5 @@
             <space />
             <key key="shop" value="alcohol" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Alcohol -->
@@ -6096,5 +6107,5 @@
             <space />
             <key key="shop" value="beverages" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Beverages -->
@@ -6104,5 +6115,5 @@
             <space />
             <key key="shop" value="wine" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Wine -->
@@ -6119,5 +6130,5 @@
             <space />
             <key key="shop" value="clothes" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
             <combo key="organic" text="Organic" values="only,yes,no" />
@@ -6132,5 +6143,5 @@
             <space />
             <key key="shop" value="boutique" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Boutique -->
@@ -6142,5 +6153,5 @@
             <space />
             <key key="shop" value="shoes" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
             <combo key="organic" text="Organic" values="only,yes,no" />
@@ -6155,5 +6166,5 @@
             <space />
             <key key="shop" value="outdoor" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Outdoor -->
@@ -6164,5 +6175,5 @@
             <space />
             <key key="shop" value="sports" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Sports -->
@@ -6176,5 +6187,5 @@
             <space />
             <key key="shop" value="dry_cleaning" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Dry Cleaning -->
@@ -6186,5 +6197,5 @@
             <space />
             <key key="shop" value="laundry" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Laundry -->
@@ -6194,5 +6205,5 @@
             <space />
             <key key="shop" value="tailor" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Tailor -->
@@ -6204,5 +6215,5 @@
             <space />
             <key key="shop" value="fabric" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Fabric -->
@@ -6217,5 +6228,5 @@
             <space />
             <key key="shop" value="computer" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Computer -->
@@ -6227,5 +6238,5 @@
             <space />
             <key key="shop" value="electronics" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Computer -->
@@ -6236,5 +6247,5 @@
             <space />
             <key key="shop" value="mobile_phone" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Mobile Phone -->
@@ -6245,5 +6256,5 @@
             <space />
             <key key="shop" value="vacuum_cleaner" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Vacuum Cleaner -->
@@ -6255,5 +6266,5 @@
             <space />
             <key key="shop" value="hifi" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Hifi -->
@@ -6265,5 +6276,5 @@
             <space />
             <key key="shop" value="video" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Video -->
@@ -6272,5 +6283,5 @@
             <space />
             <key key="shop" value="video_games" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Video Games -->
@@ -6279,5 +6290,5 @@
             <space />
             <key key="shop" value="music" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Music -->
@@ -6297,5 +6308,5 @@
             <space />
             <key key="amenity" value="bank" />
-            <reference ref="name_brand_operator_oh" />
+            <reference ref="name_brand_operator_oh_wheelchair" />
             <check key="atm" text="Automated Teller Machine" default="on" />
             <text key="ref" text="Reference" />
@@ -6311,5 +6322,5 @@
             <space />
             <key key="amenity" value="bureau_de_change" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Money Exchange -->
@@ -6330,5 +6341,5 @@
             <text key="brand" text="Brand" />
             <text key="operator" text="Operator" />
-            <reference ref="oh" />
+            <reference ref="oh_wheelchair" />
         </item> <!-- Automated Teller Machine -->
         <item name="Pawnbroker" icon="presets/pawnbroker.svg" type="node,closedway" preset_name_label="true">
@@ -6338,5 +6349,5 @@
             <space />
             <key key="shop" value="pawnbroker" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Pawnbroker -->
@@ -6351,5 +6362,5 @@
             <space />
             <key key="shop" value="furniture" />
-            <reference ref="name_brand_operator_oh" />
+            <reference ref="name_brand_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Furniture -->
@@ -6363,5 +6374,5 @@
             <space />
             <key key="shop" value="kitchen" />
-            <reference ref="name_brand_operator_oh" />
+            <reference ref="name_brand_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Kitchen -->
@@ -6372,5 +6383,5 @@
             <space />
             <key key="shop" value="curtain" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Curtain -->
@@ -6382,5 +6393,5 @@
             <space />
             <key key="shop" value="art" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Art -->
@@ -6392,5 +6403,5 @@
             <space />
             <key key="shop" value="frame" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Frame -->
@@ -6403,5 +6414,5 @@
             <space />
             <key key="shop" value="bed" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Bed -->
@@ -6412,5 +6423,5 @@
             <space />
             <key key="shop" value="interior_decoration" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Interior Decoration -->
@@ -6421,5 +6432,5 @@
             <space />
             <key key="shop" value="antiques" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Antiques -->
@@ -6434,5 +6445,5 @@
             <space />
             <key key="shop" value="stationery" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
         </item> <!-- Stationery -->
         <item name="Copy Shop" icon="presets/copyshop.png" type="node,closedway" preset_name_label="true">
@@ -6444,5 +6455,5 @@
             <space />
             <key key="shop" value="copyshop" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
         </item> <!-- Copy Shop -->
         <item name="Book Store" icon="styles/standard/shop/book.svg" type="node,closedway" preset_name_label="true">
@@ -6455,5 +6466,5 @@
             <space />
             <key key="shop" value="books" />
-            <reference ref="name_brand_oh" />
+            <reference ref="name_brand_oh_wheelchair" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
         </item> <!-- Book Store -->
@@ -6467,5 +6478,5 @@
             <space />
             <key key="shop" value="newsagent" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
         </item> <!-- Newspaper Stand -->
         <item name="Ticket" icon="styles/standard/shop/ticket.svg" type="node,closedway" preset_name_label="true">
@@ -6474,5 +6485,5 @@
             <space />
             <key key="shop" value="ticket" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Ticket -->
@@ -6489,5 +6500,5 @@
             <space />
             <key key="shop" value="department_store" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Department Store -->
@@ -6500,5 +6511,5 @@
             <space />
             <key key="shop" value="mall" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Mall -->
@@ -6512,5 +6523,5 @@
             <space />
             <key key="shop" value="chemist" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Chemist -->
@@ -6525,5 +6536,5 @@
             <space />
             <key key="shop" value="hairdresser" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Hairdresser/Barber -->
@@ -6537,5 +6548,5 @@
             <space />
             <key key="shop" value="beauty" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Beauty -->
@@ -6547,5 +6558,5 @@
             <space />
             <key key="shop" value="tattoo" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Tattoo -->
@@ -6556,5 +6567,5 @@
             <space />
             <key key="shop" value="optician" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Optician -->
@@ -6566,5 +6577,5 @@
             <space />
             <key key="shop" value="jewelry" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Jewellery -->
@@ -6578,5 +6589,5 @@
             <space />
             <key key="shop" value="gift" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <optional>
                 <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
@@ -6591,5 +6602,5 @@
             <space />
             <key key="shop" value="erotic" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Erotic -->
@@ -6604,5 +6615,5 @@
             <space />
             <key key="shop" value="florist" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Florist -->
@@ -6617,5 +6628,5 @@
             <space />
             <key key="shop" value="garden_centre" />
-            <reference ref="name_brand_oh" />
+            <reference ref="name_brand_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Garden Centre -->
@@ -6630,5 +6641,5 @@
             <space />
             <key key="shop" value="doityourself" />
-            <reference ref="name_brand_oh" />
+            <reference ref="name_brand_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Do-It-Yourself Store -->
@@ -6641,5 +6652,5 @@
             <space />
             <key key="shop" value="hardware" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Hardware -->
@@ -6651,5 +6662,5 @@
             <space />
             <key key="shop" value="paint" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Paint -->
@@ -6661,5 +6672,5 @@
             <space />
             <key key="shop" value="travel_agency" />
-            <reference ref="name_brand_oh" />
+            <reference ref="name_brand_oh_wheelchair" />
         </item> <!-- Travel Agency -->
         <item name="Musical Instrument" icon="presets/musical_instrument.png" type="node,closedway" preset_name_label="true">
@@ -6669,5 +6680,5 @@
             <space />
             <key key="shop" value="musical_instrument" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
         </item> <!-- Musical Instrument -->
         <item name="Toys" icon="styles/standard/shop/toys.png" type="node,closedway" preset_name_label="true">
@@ -6679,5 +6690,5 @@
             <space />
             <key key="shop" value="toys" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
         </item> <!-- Toys -->
         <item name="Variety Store" icon="presets/variety_store.png" type="node,closedway" preset_name_label="true">
@@ -6690,5 +6701,5 @@
             <space />
             <key key="shop" value="variety_store" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
         </item> <!-- Variety Store -->
         <item name="Bookmaker" icon="presets/lottery.svg" type="node,closedway" preset_name_label="true">
@@ -6696,5 +6707,5 @@
             <space />
             <key key="shop" value="bookmaker" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
         </item> <!-- Bookmaker -->
         <item name="Lottery" icon="presets/lottery.svg" type="node,closedway" preset_name_label="true">
@@ -6704,5 +6715,5 @@
             <space />
             <key key="shop" value="lottery" />
-            <reference ref="name_operator_oh" />
+            <reference ref="name_operator_oh_wheelchair" />
         </item> <!-- Lottery -->
         <item name="Bag" icon="styles/standard/shop/bag.svg" type="node,closedway" preset_name_label="true">
@@ -6712,5 +6723,5 @@
             <space />
             <key key="shop" value="bag" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Bag -->
@@ -6723,5 +6734,5 @@
             <space />
             <key key="shop" value="pet" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Pet -->
@@ -6736,5 +6747,5 @@
             <space />
             <key key="shop" value="funeral_directors" />
-            <reference ref="name_oh" />
+            <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact" />
         </item> <!-- Funeral Directors -->
@@ -6805,5 +6816,6 @@
             <text key="protection_title" text="Title or type of protection" />
             <optional>
-                <reference ref="name_operator_oh" />
+                <reference ref="name_operator" />
+                <reference ref="oh" />
                 <text key="wikipedia" text="Wikipedia" />
                 <text key="start_date" text="Start date" />
@@ -7045,5 +7057,5 @@
             <key key="natural" value="cave_entrance" />
             <reference ref="name_wikipedia" />
-            <reference ref="oh" />
+            <reference ref="oh_wheelchair" />
             <reference ref="general_access" />
             <reference ref="fee" />