Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 8025)
+++ /trunk/data/defaultpresets.xml	(revision 8026)
@@ -85,10 +85,4 @@
             <check key="bicycle" text="Bicycle" default="on"/>
         </optional>
-    </chunk>
-    <chunk id="contact">
-        <text key="phone" text="Phone Number"/>
-        <text key="fax" text="Fax Number"/>
-        <text key="website" text="Website"/>
-        <text key="email" text="Email Address"/>
     </chunk>
     <chunk id="name_ref">
@@ -316,8 +310,6 @@
     </chunk>
   <!-- Link chunks -->
-  <chunk id="link_contact">
+  <chunk id="link_contact_address">
     <preset_link preset_name="Contact (Common Schema)" />
-  </chunk>
-  <chunk id="link_address">
     <preset_link preset_name="Addresses" />
   </chunk>
@@ -2470,5 +2462,5 @@
             <key key="shop" value="car" />
             <reference ref="name_brand_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Car Dealer -->
         <item name="Repair" icon="presets/car_repair.png" type="node,closedway" preset_name_label="true">
@@ -2481,5 +2473,5 @@
             <key key="shop" value="car_repair" />
             <reference ref="name_brand_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Repair -->
         <item name="Parts" icon="styles/standard/vehicle/car_parts.svg" type="node,closedway" preset_name_label="true">
@@ -2490,5 +2482,5 @@
             <key key="shop" value="car_parts" />
             <reference ref="name_brand_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Parts -->
         <item name="Tires" icon="presets/tyres.png" type="node,closedway" preset_name_label="true">
@@ -2499,5 +2491,5 @@
             <key key="shop" value="tyres" />
             <reference ref="name_brand_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Tires -->
         <separator/>
@@ -2514,5 +2506,5 @@
             <reference ref="name_brand_operator_oh_wheelchair" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Rental -->
         <item name="Sharing" icon="presets/car_sharing.png" type="node,closedway" preset_name_label="true">
@@ -2567,5 +2559,5 @@
                 <text key="services" text="Other" />
             </optional>
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Motorcycle Dealer -->
     </group> <!-- Motorcycle -->
@@ -2612,5 +2604,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" />
+            <reference ref="link_contact_address" />
         </item> <!-- Bike Dealer -->
         <item name="Rental" icon="presets/bicycle_rental.png" type="node,closedway" preset_name_label="true">
@@ -2629,5 +2621,5 @@
             <key key="amenity" value="bicycle_rental" />
             <text key="name" text="Name" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Rental -->
         <item name="Public Bicycle Repair Station" icon="styles/standard/vehicle/bicycle_repair_station.svg" type="node,closedway" preset_name_label="true">
@@ -3031,5 +3023,5 @@
             <text key="name" text="Name" />
             <reference ref="internet" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Terminal -->
         <item name="Gate" name_context="airport" icon="presets/aeroway_gate.png" type="node" preset_name_label="true">
@@ -3063,5 +3055,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Hotel -->
         <item name="Motel" icon="styles/standard/accommodation/motel.png" type="node,closedway" preset_name_label="true">
@@ -3080,5 +3072,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Motel -->
         <item name="Guest House/Bed &amp; Breakfast" icon="styles/standard/accommodation/guest_house.png" type="node,closedway" preset_name_label="true">
@@ -3096,5 +3088,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Guest House/Bed & Breakfast -->
         <item name="Chalet" icon="styles/standard/accommodation/chalet.png" type="node,closedway" preset_name_label="true">
@@ -3113,5 +3105,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Chalet -->
         <item name="Hostel" icon="styles/standard/accommodation/hostel.png" type="node,closedway" preset_name_label="true">
@@ -3131,5 +3123,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Hostel -->
         <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut_blue.png" type="node,closedway" preset_name_label="true">
@@ -3147,5 +3139,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Alpine Hut -->
         <separator/>
@@ -3168,5 +3160,5 @@
             <check key="tents" text="Tents allowed" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Caravan Site/RV Park -->
         <item name="Camping Site" icon="styles/standard/accommodation/camping.png" type="node,closedway" preset_name_label="true">
@@ -3187,5 +3179,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Camping Site -->
     </group> <!-- Accommodation -->
@@ -3209,5 +3201,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Restaurant -->
         <item name="Fast Food" icon="presets/fastfood.png" type="node,closedway" preset_name_label="true">
@@ -3225,5 +3217,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Fast Food -->
         <item name="Food Court" icon="presets/restaurant.png" type="node,closedway" preset_name_label="true">
@@ -3238,5 +3230,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Food Court -->
         <item name="Cafe" icon="presets/cafe.png" type="node,closedway" preset_name_label="true">
@@ -3258,5 +3250,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Cafe -->
         <item name="Pub" icon="presets/pub.png" type="node,closedway" preset_name_label="true">
@@ -3274,5 +3266,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Pub -->
         <item name="Beer Garden" icon="presets/biergarten.png" type="node,closedway" preset_name_label="true">
@@ -3290,5 +3282,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Beer Garden -->
         <item name="Bar" icon="styles/standard/food/bar.png" type="node,closedway" preset_name_label="true">
@@ -3307,5 +3299,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Bar -->
         <item name="Night Club" icon="styles/standard/leisure/discoball.svg" type="node,closedway" preset_name_label="true">
@@ -3325,5 +3317,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Night Club -->
         <item name="Strip Club" icon="styles/standard/leisure/nightclub.png" type="node,closedway" preset_name_label="true">
@@ -3339,5 +3331,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Strip Club -->
     </group> <!-- Food+Drinks -->
@@ -3379,5 +3371,5 @@
             <reference ref="name_oh_wheelchair" />
             <reference ref="internet" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Information Office -->
         <item name="Map" icon="presets/map.png" type="node" preset_name_label="true">
@@ -3511,6 +3503,5 @@
             <text key="screen" text="Number of screens" />
             <text key="min_age" text="Minimum age" />
-            <reference ref="link_address" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Movie Theater/Cinema -->
         <item name="Zoo" icon="presets/zoo.png" type="node,closedway" preset_name_label="true">
@@ -3525,5 +3516,5 @@
             <text key="wikipedia" text="Wikipedia" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Zoo -->
         <item name="Dog Park" icon="presets/dogpark.png" type="node,closedway" preset_name_label="true">
@@ -3554,5 +3545,5 @@
             <reference ref="name_operator_oh_wheelchair" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Amusement/Theme Park -->
         <item name="Water Park" icon="styles/standard/leisure/water_park.png" type="node,closedway" preset_name_label="true">
@@ -3568,5 +3559,5 @@
             <reference ref="name_operator_oh_wheelchair" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Water Park -->
         <item name="Sauna" de.name="Sauna" icon="presets/sauna.png" type="node,closedway" preset_name_label="true">
@@ -3580,5 +3571,5 @@
             <combo key="access" text="Access" values="yes,permissive,private" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Sauna -->
         <item name="Horse Riding" icon="presets/equestrian.png" type="node,closedway" preset_name_label="true">
@@ -3589,5 +3580,5 @@
             <reference ref="fee" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Horse Riding -->
         <item name="Brothel" de.name="Bordell" icon="styles/standard/leisure/stripclub.png" type="node,closedway" preset_name_label="true">
@@ -3605,5 +3596,5 @@
             <reference ref="internet_smoking" />
             <space />
-            <reference ref="contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Brothel -->
         <separator/>
@@ -3697,5 +3688,5 @@
             <reference ref="name_operator_oh_wheelchair" />
             <text key="wikipedia" text="Wikipedia" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Museum -->
         <item name="Theatre" icon="presets/theater.png" type="node,closedway,relation" preset_name_label="true">
@@ -3710,5 +3701,5 @@
             <reference ref="name_operator" />
             <reference ref="wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Theatre -->
         <item name="Library" icon="styles/standard/shop/library.png" type="node,closedway,relation" preset_name_label="true">
@@ -3724,5 +3715,5 @@
             <key key="amenity" value="library" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Library -->
         <item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,relation" preset_name_label="true">
@@ -3735,5 +3726,5 @@
             <key key="amenity" value="arts_centre" />
             <text key="name" text="Name" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Arts Centre -->
         <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway" preset_name_label="true">
@@ -3764,5 +3755,5 @@
             <reference ref="wheelchair" />
             <combo key="type" text="Type" values="audio,video" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Recording Studio -->
     </group> <!-- Culture -->
@@ -3791,4 +3782,5 @@
             <reference ref="service_times" />
             <reference ref="oh_wheelchair" />
+            <reference ref="link_contact_address" />
         </item> <!-- Church -->
         <item name="Mosque" icon="styles/standard/religion/muslim.png" type="node,closedway,relation" preset_name_label="true">
@@ -3814,4 +3806,5 @@
             <reference ref="service_times" />
             <reference ref="oh_wheelchair" />
+            <reference ref="link_contact_address" />
         </item> <!-- Mosque -->
         <item name="Synagogue" icon="styles/standard/religion/jewish.png" type="node,closedway,relation" preset_name_label="true">
@@ -3837,4 +3830,5 @@
             <reference ref="service_times" />
             <reference ref="oh_wheelchair" />
+            <reference ref="link_contact_address" />
         </item> <!-- Synagogue -->
         <item name="Buddhist Temple" icon="styles/standard/religion/buddhism.png" type="node,closedway,relation" preset_name_label="true">
@@ -3859,4 +3853,5 @@
             <reference ref="service_times" />
             <reference ref="oh_wheelchair" />
+            <reference ref="link_contact_address" />
         </item> <!-- Buddhist Temple -->
         <item name="Hindu Temple" icon="styles/standard/religion/hinduism.png" type="node,closedway,relation" preset_name_label="true">
@@ -3881,4 +3876,5 @@
             <reference ref="service_times" />
             <reference ref="oh_wheelchair" />
+            <reference ref="link_contact_address" />
         </item> <!-- Hindu Temple -->
         <item name="Shinto Shrine" icon="styles/standard/religion/shinto.png" type="node,closedway,relation" preset_name_label="true">
@@ -3902,4 +3898,5 @@
             <reference ref="service_times" />
             <reference ref="oh_wheelchair" />
+            <reference ref="link_contact_address" />
         </item> <!-- Shinto Shrine -->
         <item name="Other Place of Worship" icon="styles/standard/religion.png" type="node,closedway,relation" preset_name_label="true">
@@ -3923,4 +3920,5 @@
             <reference ref="service_times" />
             <reference ref="oh_wheelchair" />
+            <reference ref="link_contact_address" />
         </item> <!-- Other Place of Worship -->
     </group> <!-- Place of Worship -->
@@ -3934,4 +3932,5 @@
             <key key="amenity" value="public_building" />
             <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address" />
         </item> <!-- Public Building -->
         <item name="Town Hall" icon="presets/townhall.png" type="node,closedway,relation" preset_name_label="true">
@@ -3946,5 +3945,5 @@
             <key key="amenity" value="townhall" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Town Hall -->
         <item name="Community Centre" icon="presets/community_centre.png" type="node,closedway" preset_name_label="true">
@@ -3959,4 +3958,5 @@
             <key key="amenity" value="community_centre" />
             <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="link_contact_address" />
         </item> <!-- Community Centre -->
         <item name="Embassy" icon="presets/embassy.png" type="node,closedway,relation" preset_name_label="true">
@@ -3971,5 +3971,5 @@
             <key key="amenity" value="embassy" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Embassy -->
         <item name="Courthouse" icon="presets/JusticeScales.png" type="node,closedway,relation" preset_name_label="true">
@@ -3983,5 +3983,5 @@
             <key key="amenity" value="courthouse" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Courthouse -->
         <item name="Prison" icon="presets/prison.png" type="node,closedway,relation" preset_name_label="true">
@@ -3995,5 +3995,5 @@
             <key key="amenity" value="prison" />
             <reference ref="name_operator" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Prison -->
         <item name="Police" icon="styles/standard/service/police.png" type="node,closedway,relation" preset_name_label="true">
@@ -4009,5 +4009,5 @@
             <key key="amenity" value="police" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Police -->
         <item name="Ranger Station" icon="styles/standard/service/ranger_station.svg" type="node,closedway" preset_name_label="true">
@@ -4016,5 +4016,5 @@
             <key key="amenity" value="ranger_station" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Ranger Station -->
         <item name="Fire Station" icon="presets/firebrigade.png" type="node,closedway,relation" preset_name_label="true">
@@ -4030,4 +4030,5 @@
             <key key="amenity" value="fire_station" />
             <text key="name" text="Name" />
+            <reference ref="link_contact_address" />
         </item> <!-- Fire Station -->
         <item name="Post Office" icon="styles/standard/service/post_office.png" type="node,closedway,relation" preset_name_label="true">
@@ -4046,4 +4047,5 @@
             <reference ref="name_operator_oh_wheelchair" />
             <text key="ref" text="Reference" />
+            <reference ref="link_contact_address" />
         </item> <!-- Post Office -->
     </group> <!-- Public Buildings -->
@@ -4060,5 +4062,5 @@
             <key key="amenity" value="kindergarten" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Kindergarten -->
         <item name="School" icon="presets/school.png" type="node,closedway,relation" preset_name_label="true">
@@ -4076,5 +4078,5 @@
             <key key="amenity" value="school" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- School -->
         <item name="University" icon="styles/standard/education/university.png" type="node,closedway,relation" preset_name_label="true">
@@ -4091,5 +4093,5 @@
             <key key="amenity" value="university" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- University -->
         <item name="College" icon="styles/standard/education/college.png" type="node,closedway,relation" preset_name_label="true">
@@ -4103,5 +4105,5 @@
             <key key="amenity" value="college" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- College -->
          <item name="Driving School" icon="styles/standard/education/driving_school.png" type="node,closedway" preset_name_label="true">
@@ -4113,5 +4115,5 @@
             <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" />
+            <reference ref="link_contact_address" />
         </item> <!-- Driving School -->
     </group> <!-- Education -->
@@ -4129,5 +4131,5 @@
             <key key="amenity" value="hospital" />
             <reference ref="name_operator" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Hospital -->
         <item name="Clinic" icon="styles/standard/health/hospital.png" type="node,closedway" preset_name_label="true">
@@ -4137,5 +4139,5 @@
             <key key="amenity" value="clinic" />
             <reference ref="name_operator" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Clinic -->
         <item name="Doctor's Office" icon="styles/standard/health/doctor.png" type="node,closedway" preset_name_label="true">
@@ -4148,5 +4150,5 @@
             <key key="amenity" value="doctors" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Doctor's Office -->
         <item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway" preset_name_label="true">
@@ -4158,5 +4160,5 @@
             <key key="amenity" value="dentist" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Dentist -->
         <item name="Nursing Home" type="node,closedway" preset_name_label="true">
@@ -4169,5 +4171,5 @@
             <key key="amenity" value="nursing_home" />
             <reference ref="name_operator" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Nursing Home -->
         <item name="Retirement Home" type="node,closedway" preset_name_label="true">
@@ -4184,5 +4186,5 @@
             <reference ref="name_operator" />
             <text key="capacity" text="Capacity" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Retirement Home -->
         <separator/>
@@ -4200,5 +4202,5 @@
             <reference ref="name_operator_oh_wheelchair" />
             <combo key="dispensing" text="Dispensing" values="yes,no" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Pharmacy -->
         <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway" preset_name_label="true">
@@ -4209,5 +4211,5 @@
             <key key="shop" value="hearing_aids" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Hearing Aids -->
         <separator/>
@@ -4226,4 +4228,5 @@
             <key key="amenity" value="baby_hatch" />
             <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="link_contact_address" />
         </item> <!-- Baby Hatch/Safe Haven -->
         <separator/>
@@ -4257,5 +4260,5 @@
             <key key="amenity" value="veterinary" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Veterinary -->
     </group> <!-- Health -->
@@ -4544,4 +4547,5 @@
             <text key="name" text="Name" />
             <reference ref="optional_sport" />
+            <reference ref="link_contact_address" />
         </item> <!-- Stadium -->
         <item name="Sports Centre" icon="styles/standard/sport/centre.png" type="node,closedway" preset_name_label="true">
@@ -4556,4 +4560,5 @@
             <text key="name" text="Name" />
             <reference ref="optional_sport" />
+            <reference ref="link_contact_address" />
         </item> <!-- Sports Centre -->
         <item name="Pitch" icon="styles/standard/sport/pitch.png" type="node,closedway" preset_name_label="true">
@@ -4571,4 +4576,5 @@
             <text key="name" text="Name" />
             <reference ref="optional_sport" />
+            <reference ref="link_contact_address" />
         </item> <!-- Pitch -->
         <item name="Racetrack" icon="styles/standard/sport/track.png" type="node,way,closedway,relation" preset_name_label="true">
@@ -5811,4 +5817,5 @@
             <key key="historic" value="castle" />
             <reference ref="name_wikipedia" />
+            <reference ref="link_contact_address" />
         </item> <!-- Castle -->
         <item name="Ruins" icon="presets/ruins.png" type="node,closedway" preset_name_label="true">
@@ -5945,5 +5952,5 @@
             <key key="shop" value="supermarket" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Supermarket -->
         <item name="Convenience Store" icon="presets/convenience.png" type="node,closedway" preset_name_label="true">
@@ -5958,5 +5965,5 @@
             <key key="shop" value="convenience" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Convenience Store -->
         <item name="Kiosk" icon="presets/kiosk.png" type="node,closedway" preset_name_label="true">
@@ -5971,5 +5978,5 @@
             <key key="shop" value="kiosk" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Kiosk -->
         <separator/>
@@ -5988,5 +5995,5 @@
             <key key="shop" value="bakery" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Bakery -->
         <item name="Butcher" icon="styles/standard/shop/groceries/butcher.png" type="node,closedway" preset_name_label="true">
@@ -6002,5 +6009,5 @@
             <key key="shop" value="butcher" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Butcher -->
         <item name="Seafood" icon="presets/seafood.png" type="node,closedway" preset_name_label="true">
@@ -6012,5 +6019,5 @@
             <key key="shop" value="seafood" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Seafood -->
         <item name="Deli (Fine Food)" icon="presets/deli.png" type="node,closedway" preset_name_label="true">
@@ -6024,5 +6031,5 @@
             <key key="shop" value="deli" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Deli (Fine Food) -->
         <item name="Candy Store" icon="presets/confectionery.png" type="node,closedway" preset_name_label="true">
@@ -6039,5 +6046,5 @@
             <key key="shop" value="confectionery" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Candy Store -->
         <item name="Tea" icon="styles/standard/shop/groceries/tea.svg" type="node,closedway" preset_name_label="true">
@@ -6047,5 +6054,5 @@
             <key key="shop" value="tea" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Tea -->
         <item name="Coffee" icon="styles/standard/shop/groceries/coffee.svg" type="node,closedway" preset_name_label="true">
@@ -6054,5 +6061,5 @@
             <key key="shop" value="coffee" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Coffee -->
         <separator/>
@@ -6085,5 +6092,5 @@
             <reference ref="name_oh_wheelchair" />
             <combo key="organic" text="Organic" values="only,yes,no" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Greengrocer -->
         <item name="Farm Stand" icon="presets/apple.png" type="node,closedway" preset_name_label="true">
@@ -6098,5 +6105,5 @@
             <text key="description" text="Description" />
             <combo key="organic" text="Organic" values="only,yes,no" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Farm Stand -->
         <separator/>
@@ -6125,5 +6132,5 @@
             <key key="shop" value="alcohol" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Alcohol -->
         <item name="Beverages" icon="styles/standard/shop/beverages.png" type="node,closedway" preset_name_label="true">
@@ -6136,5 +6143,5 @@
             <key key="shop" value="beverages" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Beverages -->
         <item name="Wine" icon="styles/standard/shop/wine.svg" type="node,closedway" preset_name_label="true">
@@ -6144,5 +6151,5 @@
             <key key="shop" value="wine" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Wine -->
     </group> <!-- Food -->
@@ -6161,5 +6168,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" />
+            <reference ref="link_contact_address" />
         </item> <!-- Clothes -->
         <item name="Boutique" icon="presets/boutique.png" type="node,closedway" preset_name_label="true">
@@ -6172,5 +6179,5 @@
             <key key="shop" value="boutique" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Boutique -->
         <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway" preset_name_label="true">
@@ -6184,5 +6191,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" />
+            <reference ref="link_contact_address" />
         </item> <!-- Shoes -->
         <item name="Outdoor" icon="styles/standard/shop/outdoor.png" type="node,closedway" preset_name_label="true">
@@ -6195,5 +6202,5 @@
             <key key="shop" value="outdoor" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Outdoor -->
         <item name="Sports" icon="styles/standard/sport/multi.png" type="node,closedway" preset_name_label="true">
@@ -6204,5 +6211,5 @@
             <key key="shop" value="sports" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Sports -->
         <separator/>
@@ -6216,5 +6223,5 @@
             <key key="shop" value="dry_cleaning" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Dry Cleaning -->
         <item name="Laundry" icon="presets/laundry.png" type="node,closedway" preset_name_label="true">
@@ -6226,5 +6233,5 @@
             <key key="shop" value="laundry" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Laundry -->
         <item name="Tailor" icon="styles/standard/shop/tailor.png" type="node,closedway" preset_name_label="true">
@@ -6234,5 +6241,5 @@
             <key key="shop" value="tailor" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Tailor -->
         <item name="Fabric" icon="presets/fabric.png" type="node,closedway" preset_name_label="true">
@@ -6244,5 +6251,5 @@
             <key key="shop" value="fabric" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Fabric -->
     </group> <!-- Clothes -->
@@ -6257,5 +6264,5 @@
             <key key="shop" value="computer" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Computer -->
         <item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway" preset_name_label="true">
@@ -6267,5 +6274,5 @@
             <key key="shop" value="electronics" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Computer -->
         <item name="Mobile Phone" icon="presets/mobile_phone.png" type="node,closedway" preset_name_label="true">
@@ -6276,5 +6283,5 @@
             <key key="shop" value="mobile_phone" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Mobile Phone -->
         <item name="Vacuum Cleaner" icon="presets/vacuum_cleaner.png" type="node,closedway" preset_name_label="true">
@@ -6285,5 +6292,5 @@
             <key key="shop" value="vacuum_cleaner" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Vacuum Cleaner -->
         <item name="Hifi" icon="styles/standard/shop/hifi.png" type="node,closedway" preset_name_label="true">
@@ -6295,5 +6302,5 @@
             <key key="shop" value="hifi" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Hifi -->
         <item name="Video" icon="styles/standard/shop/video.png" type="node,closedway" preset_name_label="true">
@@ -6305,5 +6312,5 @@
             <key key="shop" value="video" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Video -->
         <item name="Video Games" icon="styles/standard/shop/video_games.png" type="node,closedway" preset_name_label="true">
@@ -6312,5 +6319,5 @@
             <key key="shop" value="video_games" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Video Games -->
         <item name="Music" icon="styles/standard/shop/music.svg" type="node,closedway" preset_name_label="true">
@@ -6319,5 +6326,5 @@
             <key key="shop" value="music" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Music -->
     </group> <!-- Electronic -->
@@ -6339,5 +6346,5 @@
             <check key="atm" text="Automated Teller Machine" default="on" />
             <text key="ref" text="Reference" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Bank -->
         <item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway" preset_name_label="true">
@@ -6351,5 +6358,5 @@
             <key key="amenity" value="bureau_de_change" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Money Exchange -->
         <item name="Automated Teller Machine" icon="styles/standard/money/atm.png" type="node" preset_name_label="true">
@@ -6378,5 +6385,5 @@
             <key key="shop" value="pawnbroker" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Pawnbroker -->
     </group> <!-- Cash -->
@@ -6391,5 +6398,5 @@
             <key key="shop" value="furniture" />
             <reference ref="name_brand_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Furniture -->
         <item name="Kitchen" icon="presets/kitchen.png" type="node,closedway" preset_name_label="true">
@@ -6403,5 +6410,5 @@
             <key key="shop" value="kitchen" />
             <reference ref="name_brand_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Kitchen -->
         <item name="Curtain" icon="presets/curtain.png" type="node,closedway" preset_name_label="true">
@@ -6412,5 +6419,5 @@
             <key key="shop" value="curtain" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Curtain -->
         <item name="Art" icon="styles/standard/shop/art.svg" type="node,closedway" preset_name_label="true">
@@ -6422,5 +6429,5 @@
             <key key="shop" value="art" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Art -->
         <item name="Frame" icon="presets/frame.png" type="node,closedway" preset_name_label="true">
@@ -6432,5 +6439,5 @@
             <key key="shop" value="frame" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Frame -->
         <item name="Bed" icon="styles/standard/shop/bed.svg" type="node,closedway" preset_name_label="true">
@@ -6443,5 +6450,5 @@
             <key key="shop" value="bed" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Bed -->
         <item name="Interior Decoration" icon="styles/standard/shop/interior_decoration.svg" type="node,closedway" preset_name_label="true">
@@ -6452,5 +6459,5 @@
             <key key="shop" value="interior_decoration" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Interior Decoration -->
         <item name="Antiques" icon="styles/standard/shop/antique.svg" type="node,closedway" preset_name_label="true">
@@ -6461,5 +6468,5 @@
             <key key="shop" value="antiques" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Antiques -->
     </group> <!-- Home decoration -->
@@ -6474,4 +6481,5 @@
             <key key="shop" value="stationery" />
             <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address" />
         </item> <!-- Stationery -->
         <item name="Copy Shop" icon="presets/copyshop.png" type="node,closedway" preset_name_label="true">
@@ -6484,4 +6492,5 @@
             <key key="shop" value="copyshop" />
             <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="link_contact_address" />
         </item> <!-- Copy Shop -->
         <item name="Book Store" icon="styles/standard/shop/book.svg" type="node,closedway" preset_name_label="true">
@@ -6496,4 +6505,5 @@
             <reference ref="name_brand_oh_wheelchair" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
+            <reference ref="link_contact_address" />
         </item> <!-- Book Store -->
         <item name="Newspaper Stand" icon="presets/kiosk.png" type="node,closedway" preset_name_label="true">
@@ -6507,4 +6517,5 @@
             <key key="shop" value="newsagent" />
             <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address" />
         </item> <!-- Newspaper Stand -->
         <item name="Ticket" icon="styles/standard/shop/ticket.svg" type="node,closedway" preset_name_label="true">
@@ -6514,5 +6525,5 @@
             <key key="shop" value="ticket" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Ticket -->
     </group> <!-- Printed Material -->
@@ -6529,5 +6540,5 @@
             <key key="shop" value="department_store" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Department Store -->
         <item name="Mall" icon="styles/standard/shop/mall.png" type="node,closedway" preset_name_label="true">
@@ -6540,5 +6551,5 @@
             <key key="shop" value="mall" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Mall -->
         <separator/>
@@ -6552,5 +6563,5 @@
             <key key="shop" value="chemist" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Chemist -->
         <item name="Hairdresser/Barber" icon="styles/standard/shop/hairdresser.png" type="node,closedway" preset_name_label="true">
@@ -6565,5 +6576,5 @@
             <key key="shop" value="hairdresser" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Hairdresser/Barber -->
         <item name="Beauty" icon="styles/standard/shop/beauty.svg" type="node,closedway" preset_name_label="true">
@@ -6577,5 +6588,5 @@
             <key key="shop" value="beauty" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Beauty -->
         <item name="Tattoo" icon="styles/standard/shop/tattoo.svg" type="node,closedway" preset_name_label="true">
@@ -6587,5 +6598,5 @@
             <key key="shop" value="tattoo" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Tattoo -->
         <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway" preset_name_label="true">
@@ -6596,5 +6607,5 @@
             <key key="shop" value="optician" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Optician -->
         <item name="Jewellery" icon="styles/standard/shop/jewelry.png" type="node,closedway" preset_name_label="true">
@@ -6606,5 +6617,5 @@
             <key key="shop" value="jewelry" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Jewellery -->
         <item name="Gift/Souvenir" icon="presets/present.svg" type="node,closedway" preset_name_label="true">
@@ -6622,5 +6633,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" />
+            <reference ref="link_contact_address" />
         </item> <!-- Gift/Souvenir -->
         <item name="Erotic" icon="presets/erotic.png" type="node,closedway" preset_name_label="true">
@@ -6631,5 +6642,5 @@
             <key key="shop" value="erotic" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Erotic -->
         <separator/>
@@ -6644,5 +6655,5 @@
             <key key="shop" value="florist" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Florist -->
         <item name="Garden Centre" icon="styles/standard/shop/garden_centre.png" type="node,closedway" preset_name_label="true">
@@ -6657,5 +6668,5 @@
             <key key="shop" value="garden_centre" />
             <reference ref="name_brand_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Garden Centre -->
         <separator/>
@@ -6670,5 +6681,5 @@
             <key key="shop" value="doityourself" />
             <reference ref="name_brand_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Do-It-Yourself Store -->
         <item name="Hardware" icon="presets/hardware.png" type="node,closedway" preset_name_label="true">
@@ -6681,5 +6692,5 @@
             <key key="shop" value="hardware" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Hardware -->
         <item name="Paint" icon="presets/paint.png" type="node,closedway" preset_name_label="true">
@@ -6691,5 +6702,5 @@
             <key key="shop" value="paint" />
             <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Paint -->
         <separator/>
@@ -6701,4 +6712,5 @@
             <key key="shop" value="travel_agency" />
             <reference ref="name_brand_oh_wheelchair" />
+            <reference ref="link_contact_address" />
         </item> <!-- Travel Agency -->
         <item name="Musical Instrument" icon="presets/musical_instrument.png" type="node,closedway" preset_name_label="true">
@@ -6709,4 +6721,5 @@
             <key key="shop" value="musical_instrument" />
             <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="link_contact_address" />
         </item> <!-- Musical Instrument -->
         <item name="Toys" icon="styles/standard/shop/toys.png" type="node,closedway" preset_name_label="true">
@@ -6719,4 +6732,5 @@
             <key key="shop" value="toys" />
             <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address" />
         </item> <!-- Toys -->
         <item name="Variety Store" icon="presets/variety_store.png" type="node,closedway" preset_name_label="true">
@@ -6730,4 +6744,5 @@
             <key key="shop" value="variety_store" />
             <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="link_contact_address" />
         </item> <!-- Variety Store -->
         <item name="Bookmaker" icon="presets/lottery.svg" type="node,closedway" preset_name_label="true">
@@ -6736,4 +6751,5 @@
             <key key="shop" value="bookmaker" />
             <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="link_contact_address" />
         </item> <!-- Bookmaker -->
         <item name="Lottery" icon="presets/lottery.svg" type="node,closedway" preset_name_label="true">
@@ -6744,4 +6760,5 @@
             <key key="shop" value="lottery" />
             <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="link_contact_address" />
         </item> <!-- Lottery -->
         <item name="Bag" icon="styles/standard/shop/bag.svg" type="node,closedway" preset_name_label="true">
@@ -6752,5 +6769,5 @@
             <key key="shop" value="bag" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Bag -->
         <item name="Pet" icon="styles/standard/shop/pet.svg" type="node,closedway" preset_name_label="true">
@@ -6763,5 +6780,5 @@
             <key key="shop" value="pet" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Pet -->
         <item name="Funeral Directors" icon="styles/standard/shop/funeral_directors.svg" type="node,closedway" preset_name_label="true">
@@ -6776,5 +6793,5 @@
             <key key="shop" value="funeral_directors" />
             <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact" />
+            <reference ref="link_contact_address" />
         </item> <!-- Funeral Directors -->
     </group> <!-- Other -->