Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 8059)
+++ /trunk/data/defaultpresets.xml	(revision 8060)
@@ -316,4 +316,9 @@
     <preset_link preset_name="Addresses" />
   </chunk>
+  <chunk id="link_contact_address_payment">
+    <preset_link preset_name="Contact (Common Schema)" />
+    <preset_link preset_name="Addresses" />
+    <preset_link preset_name="Payment Methods" />
+  </chunk>
   <!--  Groups -->
   <group name="Highways" icon="presets/way_secondary.png">
@@ -2449,4 +2454,5 @@
                 </checkgroup>
             </optional>
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Fuel -->
         <item name="Charging Station" icon="styles/standard/vehicle/fuel/charging_station.png" type="node" preset_name_label="true">
@@ -2472,4 +2478,5 @@
             <key key="amenity" value="car_wash" />
             <reference ref="name_brand_operator_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Wash -->
         <separator/>
@@ -2487,5 +2494,5 @@
             <key key="shop" value="car" />
             <reference ref="name_brand_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Car Dealer -->
         <item name="Repair" icon="presets/car_repair.png" type="node,closedway" preset_name_label="true">
@@ -2498,5 +2505,5 @@
             <key key="shop" value="car_repair" />
             <reference ref="name_brand_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Repair -->
         <item name="Parts" icon="styles/standard/vehicle/car_parts.svg" type="node,closedway" preset_name_label="true">
@@ -2507,5 +2514,5 @@
             <key key="shop" value="car_parts" />
             <reference ref="name_brand_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Parts -->
         <item name="Tires" icon="presets/tyres.png" type="node,closedway" preset_name_label="true">
@@ -2516,5 +2523,5 @@
             <key key="shop" value="tyres" />
             <reference ref="name_brand_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Tires -->
         <separator/>
@@ -2531,5 +2538,5 @@
             <reference ref="name_brand_operator_oh_wheelchair" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Rental -->
         <item name="Sharing" icon="presets/car_sharing.png" type="node,closedway" preset_name_label="true">
@@ -2584,5 +2591,5 @@
                 <text key="services" text="Other" />
             </optional>
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Motorcycle Dealer -->
     </group> <!-- Motorcycle -->
@@ -2629,5 +2636,5 @@
             <check key="service:bicycle:diy" text="Tools for do-it-yourself repair (may be a bike co-operative)" />
             <check key="service:bicycle:cleaning" text="Bicycles are washed (for a fee)" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Bike Dealer -->
         <item name="Rental" icon="presets/bicycle_rental.png" type="node,closedway" preset_name_label="true">
@@ -2646,5 +2653,5 @@
             <key key="amenity" value="bicycle_rental" />
             <text key="name" text="Name" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Rental -->
         <item name="Public Bicycle Repair Station" icon="styles/standard/vehicle/bicycle_repair_station.svg" type="node,closedway" preset_name_label="true">
@@ -3080,5 +3087,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Hotel -->
         <item name="Motel" icon="styles/standard/accommodation/motel.png" type="node,closedway" preset_name_label="true">
@@ -3097,5 +3104,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Motel -->
         <item name="Guest House/Bed &amp; Breakfast" icon="styles/standard/accommodation/guest_house.png" type="node,closedway" preset_name_label="true">
@@ -3113,5 +3120,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Guest House/Bed & Breakfast -->
         <item name="Chalet" icon="styles/standard/accommodation/chalet.png" type="node,closedway" preset_name_label="true">
@@ -3130,5 +3137,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Chalet -->
         <item name="Hostel" icon="styles/standard/accommodation/hostel.png" type="node,closedway" preset_name_label="true">
@@ -3148,5 +3155,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Hostel -->
         <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut_blue.png" type="node,closedway" preset_name_label="true">
@@ -3164,5 +3171,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Alpine Hut -->
         <separator/>
@@ -3185,5 +3192,5 @@
             <check key="tents" text="Tents allowed" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Caravan Site/RV Park -->
         <item name="Camping Site" icon="styles/standard/accommodation/camping.png" type="node,closedway" preset_name_label="true">
@@ -3204,5 +3211,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Camping Site -->
     </group> <!-- Accommodation -->
@@ -3226,5 +3233,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Restaurant -->
         <item name="Fast Food" icon="presets/fastfood.png" type="node,closedway" preset_name_label="true">
@@ -3242,5 +3249,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Fast Food -->
         <item name="Food Court" icon="presets/restaurant.png" type="node,closedway" preset_name_label="true">
@@ -3255,5 +3262,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Food Court -->
         <item name="Cafe" icon="presets/cafe.png" type="node,closedway" preset_name_label="true">
@@ -3275,5 +3282,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Cafe -->
         <item name="Pub" icon="presets/pub.png" type="node,closedway" preset_name_label="true">
@@ -3291,5 +3298,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Pub -->
         <item name="Beer Garden" icon="presets/biergarten.png" type="node,closedway" preset_name_label="true">
@@ -3307,5 +3314,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Beer Garden -->
         <item name="Bar" icon="styles/standard/food/bar.png" type="node,closedway" preset_name_label="true">
@@ -3324,5 +3331,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Bar -->
         <item name="Night Club" icon="styles/standard/leisure/discoball.svg" type="node,closedway" preset_name_label="true">
@@ -3342,5 +3349,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Night Club -->
         <item name="Strip Club" icon="styles/standard/leisure/nightclub.png" type="node,closedway" preset_name_label="true">
@@ -3356,5 +3363,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Strip Club -->
     </group> <!-- Food+Drinks -->
@@ -3396,5 +3403,5 @@
             <reference ref="name_oh_wheelchair" />
             <reference ref="internet" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Information Office -->
         <item name="Map" icon="presets/map.png" type="node" preset_name_label="true">
@@ -3528,5 +3535,5 @@
             <text key="screen" text="Number of screens" />
             <text key="min_age" text="Minimum age" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Movie Theater/Cinema -->
         <item name="Zoo" icon="presets/zoo.png" type="node,closedway" preset_name_label="true">
@@ -3541,5 +3548,5 @@
             <text key="wikipedia" text="Wikipedia" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Zoo -->
         <item name="Dog Park" icon="presets/dogpark.png" type="node,closedway" preset_name_label="true">
@@ -3570,5 +3577,5 @@
             <reference ref="name_operator_oh_wheelchair" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Amusement/Theme Park -->
         <item name="Water Park" icon="styles/standard/leisure/water_park.png" type="node,closedway" preset_name_label="true">
@@ -3584,5 +3591,5 @@
             <reference ref="name_operator_oh_wheelchair" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Water Park -->
         <item name="Sauna" de.name="Sauna" icon="presets/sauna.png" type="node,closedway" preset_name_label="true">
@@ -3596,5 +3603,5 @@
             <combo key="access" text="Access" values="yes,permissive,private" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Sauna -->
         <item name="Horse Riding" icon="presets/equestrian.png" type="node,closedway" preset_name_label="true">
@@ -3605,5 +3612,5 @@
             <reference ref="fee" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Horse Riding -->
         <item name="Brothel" de.name="Bordell" icon="styles/standard/leisure/stripclub.png" type="node,closedway" preset_name_label="true">
@@ -3621,5 +3628,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Brothel -->
         <separator/>
@@ -3713,5 +3720,5 @@
             <reference ref="name_operator_oh_wheelchair" />
             <text key="wikipedia" text="Wikipedia" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Museum -->
         <item name="Theatre" icon="presets/theater.png" type="node,closedway,relation" preset_name_label="true">
@@ -3726,5 +3733,5 @@
             <reference ref="name_operator" />
             <reference ref="wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Theatre -->
         <item name="Library" icon="styles/standard/shop/library.png" type="node,closedway,relation" preset_name_label="true">
@@ -3740,5 +3747,5 @@
             <key key="amenity" value="library" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Library -->
         <item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,relation" preset_name_label="true">
@@ -3751,5 +3758,5 @@
             <key key="amenity" value="arts_centre" />
             <text key="name" text="Name" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Arts Centre -->
         <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway" preset_name_label="true">
@@ -3780,5 +3787,5 @@
             <reference ref="wheelchair" />
             <combo key="type" text="Type" values="audio,video" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Recording Studio -->
     </group> <!-- Culture -->
@@ -4072,5 +4079,5 @@
             <reference ref="name_operator_oh_wheelchair" />
             <text key="ref" text="Reference" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Post Office -->
     </group> <!-- Public Buildings -->
@@ -4156,5 +4163,5 @@
             <key key="amenity" value="hospital" />
             <reference ref="name_operator" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Hospital -->
         <item name="Clinic" icon="styles/standard/health/hospital.png" type="node,closedway" preset_name_label="true">
@@ -4164,5 +4171,5 @@
             <key key="amenity" value="clinic" />
             <reference ref="name_operator" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Clinic -->
         <item name="Doctor's Office" icon="styles/standard/health/doctor.png" type="node,closedway" preset_name_label="true">
@@ -4175,5 +4182,5 @@
             <key key="amenity" value="doctors" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Doctor's Office -->
         <item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway" preset_name_label="true">
@@ -4185,5 +4192,5 @@
             <key key="amenity" value="dentist" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Dentist -->
         <item name="Nursing Home" type="node,closedway" preset_name_label="true">
@@ -4226,5 +4233,5 @@
             <reference ref="name_operator_oh_wheelchair" />
             <combo key="dispensing" text="Dispensing" values="yes,no" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Pharmacy -->
         <separator/>
@@ -4275,5 +4282,5 @@
             <key key="amenity" value="veterinary" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Veterinary -->
     </group> <!-- Health -->
@@ -4565,5 +4572,5 @@
             <text key="name" text="Name" />
             <reference ref="optional_sport" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Stadium -->
         <item name="Sports Centre" icon="styles/standard/sport/centre.png" type="node,closedway" preset_name_label="true">
@@ -4578,5 +4585,5 @@
             <text key="name" text="Name" />
             <reference ref="optional_sport" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Sports Centre -->
         <item name="Pitch" icon="styles/standard/sport/pitch.png" type="node,closedway" preset_name_label="true">
@@ -4594,5 +4601,5 @@
             <text key="name" text="Name" />
             <reference ref="optional_sport" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Pitch -->
         <item name="Racetrack" icon="styles/standard/sport/track.png" type="node,way,closedway,relation" preset_name_label="true">
@@ -5835,5 +5842,5 @@
             <key key="historic" value="castle" />
             <reference ref="name_wikipedia" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Castle -->
         <item name="Ruins" icon="presets/ruins.png" type="node,closedway" preset_name_label="true">
@@ -5970,5 +5977,5 @@
             <key key="shop" value="supermarket" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Supermarket -->
         <item name="Convenience Store" icon="presets/convenience.png" type="node,closedway" preset_name_label="true">
@@ -5983,5 +5990,5 @@
             <key key="shop" value="convenience" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Convenience Store -->
         <item name="Kiosk" icon="presets/kiosk.png" type="node,closedway" preset_name_label="true">
@@ -5996,5 +6003,5 @@
             <key key="shop" value="kiosk" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Kiosk -->
         <separator/>
@@ -6013,5 +6020,5 @@
             <key key="shop" value="bakery" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Bakery -->
         <item name="Butcher" icon="styles/standard/shop/groceries/butcher.png" type="node,closedway" preset_name_label="true">
@@ -6027,5 +6034,5 @@
             <key key="shop" value="butcher" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Butcher -->
         <item name="Seafood" icon="presets/seafood.png" type="node,closedway" preset_name_label="true">
@@ -6037,5 +6044,5 @@
             <key key="shop" value="seafood" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Seafood -->
         <item name="Deli (Fine Food)" icon="presets/deli.png" type="node,closedway" preset_name_label="true">
@@ -6049,5 +6056,5 @@
             <key key="shop" value="deli" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Deli (Fine Food) -->
         <item name="Candy Store" icon="presets/confectionery.png" type="node,closedway" preset_name_label="true">
@@ -6064,5 +6071,5 @@
             <key key="shop" value="confectionery" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Candy Store -->
         <item name="Tea" icon="styles/standard/shop/groceries/tea.svg" type="node,closedway" preset_name_label="true">
@@ -6072,5 +6079,5 @@
             <key key="shop" value="tea" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Tea -->
         <item name="Coffee" icon="styles/standard/shop/groceries/coffee.svg" type="node,closedway" preset_name_label="true">
@@ -6079,5 +6086,5 @@
             <key key="shop" value="coffee" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Coffee -->
         <separator/>
@@ -6110,5 +6117,5 @@
             <reference ref="name_oh_wheelchair" />
             <combo key="organic" text="Organic" values="only,yes,no" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Greengrocer -->
         <item name="Farm Stand" icon="presets/apple.png" type="node,closedway" preset_name_label="true">
@@ -6123,5 +6130,5 @@
             <text key="description" text="Description" />
             <combo key="organic" text="Organic" values="only,yes,no" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Farm Stand -->
         <separator/>
@@ -6150,5 +6157,5 @@
             <key key="shop" value="alcohol" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Alcohol -->
         <item name="Beverages" icon="styles/standard/shop/beverages.png" type="node,closedway" preset_name_label="true">
@@ -6161,5 +6168,5 @@
             <key key="shop" value="beverages" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Beverages -->
         <item name="Wine" icon="styles/standard/shop/wine.svg" type="node,closedway" preset_name_label="true">
@@ -6169,5 +6176,5 @@
             <key key="shop" value="wine" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Wine -->
     </group> <!-- Food -->
@@ -6186,5 +6193,5 @@
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
             <combo key="organic" text="Organic" values="only,yes,no" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Clothes -->
         <item name="Boutique" icon="presets/boutique.png" type="node,closedway" preset_name_label="true">
@@ -6197,5 +6204,5 @@
             <key key="shop" value="boutique" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Boutique -->
         <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway" preset_name_label="true">
@@ -6209,5 +6216,5 @@
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
             <combo key="organic" text="Organic" values="only,yes,no" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Shoes -->
         <item name="Outdoor" icon="styles/standard/shop/outdoor.png" type="node,closedway" preset_name_label="true">
@@ -6220,5 +6227,5 @@
             <key key="shop" value="outdoor" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Outdoor -->
         <item name="Sports" icon="styles/standard/sport/multi.png" type="node,closedway" preset_name_label="true">
@@ -6229,5 +6236,5 @@
             <key key="shop" value="sports" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Sports -->
         <separator/>
@@ -6241,5 +6248,5 @@
             <key key="shop" value="dry_cleaning" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Dry Cleaning -->
         <item name="Laundry" icon="presets/laundry.png" type="node,closedway" preset_name_label="true">
@@ -6251,5 +6258,5 @@
             <key key="shop" value="laundry" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Laundry -->
         <item name="Tailor" icon="styles/standard/shop/tailor.png" type="node,closedway" preset_name_label="true">
@@ -6259,5 +6266,5 @@
             <key key="shop" value="tailor" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Tailor -->
         <item name="Fabric" icon="presets/fabric.png" type="node,closedway" preset_name_label="true">
@@ -6269,5 +6276,5 @@
             <key key="shop" value="fabric" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Fabric -->
     </group> <!-- Clothes -->
@@ -6282,5 +6289,5 @@
             <key key="shop" value="computer" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Computer -->
         <item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway" preset_name_label="true">
@@ -6292,5 +6299,5 @@
             <key key="shop" value="electronics" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Computer -->
         <item name="Mobile Phone" icon="presets/mobile_phone.png" type="node,closedway" preset_name_label="true">
@@ -6301,5 +6308,5 @@
             <key key="shop" value="mobile_phone" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Mobile Phone -->
         <item name="Vacuum Cleaner" icon="presets/vacuum_cleaner.png" type="node,closedway" preset_name_label="true">
@@ -6310,5 +6317,5 @@
             <key key="shop" value="vacuum_cleaner" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Vacuum Cleaner -->
         <item name="Hifi" icon="styles/standard/shop/hifi.png" type="node,closedway" preset_name_label="true">
@@ -6320,5 +6327,5 @@
             <key key="shop" value="hifi" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Hifi -->
         <item name="Video" icon="styles/standard/shop/video.png" type="node,closedway" preset_name_label="true">
@@ -6330,5 +6337,5 @@
             <key key="shop" value="video" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Video -->
         <item name="Video Games" icon="styles/standard/shop/video_games.png" type="node,closedway" preset_name_label="true">
@@ -6337,5 +6344,5 @@
             <key key="shop" value="video_games" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Video Games -->
         <item name="Music" icon="styles/standard/shop/music.svg" type="node,closedway" preset_name_label="true">
@@ -6344,5 +6351,5 @@
             <key key="shop" value="music" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Music -->
     </group> <!-- Electronic -->
@@ -6403,5 +6410,5 @@
             <key key="shop" value="pawnbroker" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Pawnbroker -->
     </group> <!-- Cash -->
@@ -6416,5 +6423,5 @@
             <key key="shop" value="furniture" />
             <reference ref="name_brand_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Furniture -->
         <item name="Kitchen" icon="presets/kitchen.png" type="node,closedway" preset_name_label="true">
@@ -6428,5 +6435,5 @@
             <key key="shop" value="kitchen" />
             <reference ref="name_brand_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Kitchen -->
         <item name="Curtain" icon="presets/curtain.png" type="node,closedway" preset_name_label="true">
@@ -6437,5 +6444,5 @@
             <key key="shop" value="curtain" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Curtain -->
         <item name="Art" icon="styles/standard/shop/art.svg" type="node,closedway" preset_name_label="true">
@@ -6447,5 +6454,5 @@
             <key key="shop" value="art" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Art -->
         <item name="Frame" icon="presets/frame.png" type="node,closedway" preset_name_label="true">
@@ -6457,5 +6464,5 @@
             <key key="shop" value="frame" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Frame -->
         <item name="Bed" icon="styles/standard/shop/bed.svg" type="node,closedway" preset_name_label="true">
@@ -6468,5 +6475,5 @@
             <key key="shop" value="bed" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Bed -->
         <item name="Interior Decoration" icon="styles/standard/shop/interior_decoration.svg" type="node,closedway" preset_name_label="true">
@@ -6477,5 +6484,5 @@
             <key key="shop" value="interior_decoration" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Interior Decoration -->
         <item name="Antiques" icon="styles/standard/shop/antique.svg" type="node,closedway" preset_name_label="true">
@@ -6486,5 +6493,5 @@
             <key key="shop" value="antiques" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Antiques -->
     </group> <!-- Home decoration -->
@@ -6499,5 +6506,5 @@
             <key key="shop" value="stationery" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Stationery -->
         <item name="Copy Shop" icon="presets/copyshop.png" type="node,closedway" preset_name_label="true">
@@ -6510,5 +6517,5 @@
             <key key="shop" value="copyshop" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Copy Shop -->
         <item name="Book Store" icon="styles/standard/shop/book.svg" type="node,closedway" preset_name_label="true">
@@ -6523,5 +6530,5 @@
             <reference ref="name_brand_oh_wheelchair" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Book Store -->
         <item name="Newspaper Stand" icon="presets/kiosk.png" type="node,closedway" preset_name_label="true">
@@ -6535,5 +6542,5 @@
             <key key="shop" value="newsagent" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Newspaper Stand -->
         <item name="Ticket" icon="styles/standard/shop/ticket.svg" type="node,closedway" preset_name_label="true">
@@ -6543,5 +6550,5 @@
             <key key="shop" value="ticket" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Ticket -->
     </group> <!-- Printed Material -->
@@ -6558,5 +6565,5 @@
             <key key="shop" value="department_store" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Department Store -->
         <item name="Mall" icon="styles/standard/shop/mall.png" type="node,closedway" preset_name_label="true">
@@ -6569,5 +6576,5 @@
             <key key="shop" value="mall" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Mall -->
         <separator/>
@@ -6581,5 +6588,5 @@
             <key key="shop" value="chemist" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Chemist -->
         <item name="Hairdresser/Barber" icon="styles/standard/shop/hairdresser.png" type="node,closedway" preset_name_label="true">
@@ -6594,5 +6601,5 @@
             <key key="shop" value="hairdresser" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Hairdresser/Barber -->
         <item name="Beauty" icon="styles/standard/shop/beauty.svg" type="node,closedway" preset_name_label="true">
@@ -6606,5 +6613,5 @@
             <key key="shop" value="beauty" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Beauty -->
         <item name="Tattoo" icon="styles/standard/shop/tattoo.svg" type="node,closedway" preset_name_label="true">
@@ -6616,5 +6623,5 @@
             <key key="shop" value="tattoo" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Tattoo -->
         <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway" preset_name_label="true">
@@ -6625,5 +6632,5 @@
             <key key="shop" value="optician" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Optician -->
         <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway" preset_name_label="true">
@@ -6634,5 +6641,5 @@
             <key key="shop" value="hearing_aids" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Hearing Aids -->
         <item name="Medical Supply" icon="styles/standard/shop/medical_supply.svg" type="node,closedway" preset_name_label="true">
@@ -6642,5 +6649,5 @@
             <reference ref="name_operator_oh_wheelchair" />
             <combo key="dispensing" text="Dispensing" values="yes,no" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Medical Supply -->
         <item name="Jewellery" icon="styles/standard/shop/jewelry.png" type="node,closedway" preset_name_label="true">
@@ -6652,5 +6659,5 @@
             <key key="shop" value="jewelry" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Jewellery -->
         <item name="Gift/Souvenir" icon="presets/present.svg" type="node,closedway" preset_name_label="true">
@@ -6668,5 +6675,5 @@
                 <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
             </optional>
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Gift/Souvenir -->
         <item name="Erotic" icon="presets/erotic.png" type="node,closedway" preset_name_label="true">
@@ -6677,5 +6684,5 @@
             <key key="shop" value="erotic" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Erotic -->
         <separator/>
@@ -6690,5 +6697,5 @@
             <key key="shop" value="florist" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Florist -->
         <item name="Garden Centre" icon="styles/standard/shop/garden_centre.png" type="node,closedway" preset_name_label="true">
@@ -6703,5 +6710,5 @@
             <key key="shop" value="garden_centre" />
             <reference ref="name_brand_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Garden Centre -->
         <separator/>
@@ -6716,5 +6723,5 @@
             <key key="shop" value="doityourself" />
             <reference ref="name_brand_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Do-It-Yourself Store -->
         <item name="Hardware" icon="presets/hardware.png" type="node,closedway" preset_name_label="true">
@@ -6727,5 +6734,5 @@
             <key key="shop" value="hardware" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Hardware -->
         <item name="Paint" icon="presets/paint.png" type="node,closedway" preset_name_label="true">
@@ -6737,5 +6744,5 @@
             <key key="shop" value="paint" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Paint -->
         <separator/>
@@ -6747,5 +6754,5 @@
             <key key="shop" value="travel_agency" />
             <reference ref="name_brand_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Travel Agency -->
         <item name="Musical Instrument" icon="presets/musical_instrument.png" type="node,closedway" preset_name_label="true">
@@ -6756,5 +6763,5 @@
             <key key="shop" value="musical_instrument" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Musical Instrument -->
         <item name="Toys" icon="styles/standard/shop/toys.png" type="node,closedway" preset_name_label="true">
@@ -6767,5 +6774,5 @@
             <key key="shop" value="toys" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Toys -->
         <item name="Variety Store" icon="presets/variety_store.png" type="node,closedway" preset_name_label="true">
@@ -6779,5 +6786,5 @@
             <key key="shop" value="variety_store" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Variety Store -->
         <item name="Bookmaker" icon="presets/lottery.svg" type="node,closedway" preset_name_label="true">
@@ -6786,5 +6793,5 @@
             <key key="shop" value="bookmaker" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Bookmaker -->
         <item name="Lottery" icon="presets/lottery.svg" type="node,closedway" preset_name_label="true">
@@ -6795,5 +6802,5 @@
             <key key="shop" value="lottery" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Lottery -->
         <item name="Bag" icon="styles/standard/shop/bag.svg" type="node,closedway" preset_name_label="true">
@@ -6804,5 +6811,5 @@
             <key key="shop" value="bag" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Bag -->
         <item name="Pet" icon="styles/standard/shop/pet.svg" type="node,closedway" preset_name_label="true">
@@ -6815,5 +6822,5 @@
             <key key="shop" value="pet" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Pet -->
         <item name="Funeral Directors" icon="styles/standard/shop/funeral_directors.svg" type="node,closedway" preset_name_label="true">
@@ -6828,5 +6835,5 @@
             <key key="shop" value="funeral_directors" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
+            <reference ref="link_contact_address_payment" />
         </item> <!-- Funeral Directors -->
     </group> <!-- Other -->