commit 556600ffba531e032fa11c6af928e7bf1f7000d4
Author: simon04 <simon04@0c6e7542-c601-0410-84e7-c038aed88b3b>
Date:   Sat Dec 28 22:40:51 2013 +0000

    fix #9327 - De-duplicate contents of `defaultpresets.xml` by introducing `<chunk id="X">` and `<reference ref="X" />`
    
    git-svn-id: https://josm.openstreetmap.de/svn/trunk@6558 0c6e7542-c601-0410-84e7-c038aed88b3b

diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index 428d424..3779f41 100755
--- a/data/defaultpresets.xml
+++ b/data/defaultpresets.xml
@@ -45,7 +45,7 @@ text: text box
   text: fixed label to display
   default: default string to display (defaults to "")
   use_last_as_default: true/false/force (default is "false")
-  auto_increment: may contain a comma separated list of integer increments or 
+  auto_increment: may contain a comma separated list of integer increments or
                   decrements, e.g. "-2,-1,+1,+2"; a button will be shown next
                   to the text field for each value, allowing the user to select
                   auto-increment with the given stepping. auto-increment only
@@ -59,7 +59,7 @@ combo: combo box, with multiple choices and possible to enter free form text
   text: fixed label to display
   delimiter: character that separates values (default: comma)
   values: separated list of values
-  values_from: to use instead of "values" if the list of values has to be obtained with a Java method 
+  values_from: to use instead of "values" if the list of values has to be obtained with a Java method
                of this form: public static String[] getValues();
                The value must be: "full.package.name.ClassName#methodName"
   display_values: comma separated list of values to be displayed instead of the
@@ -84,7 +84,7 @@ multiselect: list of values from which zero or more can be selected
   delimiter: character that separates values (default: semicolon) - this
              will also be used to separate selected values in the tag.
   values: delimiter-separated list of values (delimiter can be escaped with backslash)
-  values_from: to use instead of "values" if the list of values has to be obtained with a Java method 
+  values_from: to use instead of "values" if the list of values has to be obtained with a Java method
                of this form: public static String[] getValues();
                The value must be: "full.package.name.ClassName#methodName"
   rows: specify the number of rows to display (default -1)
@@ -108,7 +108,7 @@ checkgroup: group of checks
 check: checkbox
   key: key to set
   text: fixed label to display
-  default: ticked on/off
+  default: ticked on/off (default is "off")
   value_on: the value to set when checked (default is "yes")
   value_off: the value to set when unchecked (default is "no")
   match: none/key/key!/keyvalue (default is "none", see below for more information)
@@ -121,6 +121,12 @@ role: type to specify possible roles in relations
   type: the data types - way,node,relation,closedway (separated by comma)
   member_expression: an expression (cf. search dialog) for objects of this role
 
+chunk: a template of elements for later (repeated) use
+  id: the unique identifier for this chunk
+
+reference: include an earlier defined template
+  ref: he unique identifier of the (already defined) template to include
+
  presets: For external files <presets> should have following attributes:
    author: the author of the preset
    version: a version number of some sort (e.g. creation date)
@@ -148,6 +154,118 @@ the tags of an OSM object fit into this preset.
  - keyvalue: positive if key and value matches, negative otherwise
 Note that for a match, at least one positive and no negative is required.
 -->
+    <chunk id="surface">
+        <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+    </chunk>
+    <chunk id="highway_base">
+        <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3"/>
+        <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3"/>
+        <text key="maxspeed" text="Max. speed (km/h)"/>
+        <reference ref="surface" />
+    </chunk>
+    <chunk id="highway_yesno_incline">
+        <check key="bridge" text="Bridge" />
+        <check key="tunnel" text="Tunnel" />
+        <check key="cutting" text="Cutting" />
+        <check key="embankment" text="Embankment" />
+        <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down"/>
+    </chunk>
+    <chunk id="highway_yesno_incline_oneway">
+        <check key="oneway" text="Oneway" />
+        <reference ref="highway_yesno_incline" />
+    </chunk>
+    <chunk id="highway_yesno_incline_oneway_lit">
+        <reference ref="highway_yesno_incline_oneway" />
+        <check key="lit" text="Lit" />
+    </chunk>
+    <chunk id="highway_yesno_incline_oneway_lit_width">
+        <reference ref="highway_yesno_incline_oneway_lit" />
+        <check key="lit" text="Lit" />
+    </chunk>
+    <chunk id="barrier_5">
+        <optional text="Allowed traffic:">
+            <check key="foot" text="Foot" default="on"/>
+            <check key="bicycle" text="Bicycle" default="on"/>
+            <check key="horse" text="Horse" />
+            <check key="motorcycle" text="Motorcycle" />
+            <check key="motorcar" text="Motorcar" />
+        </optional>
+    </chunk>
+    <chunk id="barrier_4">
+        <optional text="Allowed traffic:">
+            <check key="foot" text="Foot" default="on"/>
+            <check key="bicycle" text="Bicycle" default="on"/>
+            <check key="horse" text="Horse" />
+            <check key="motorcycle" text="Motorcycle" />
+        </optional>
+    </chunk>
+    <chunk id="barrier_2">
+        <optional text="Allowed traffic:">
+            <check key="foot" text="Foot" default="on"/>
+            <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">
+        <text key="name" text="Name" />
+        <text key="ref" text="Reference" />
+    </chunk>
+    <chunk id="name_operator">
+        <text key="name" text="Name" />
+        <text key="operator" text="Operator" />
+    </chunk>
+    <chunk id="name_layer">
+        <text key="name" text="Name" />
+        <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+    </chunk>
+    <chunk id="oh">
+        <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+    </chunk>
+    <chunk id="name_oh">
+        <text key="name" text="Name" />
+        <reference ref="oh" />
+    </chunk>
+    <chunk id="name_operator_oh">
+        <text key="name" text="Name" />
+        <text key="operator" text="Operator" />
+        <reference ref="oh" />
+    </chunk>
+    <chunk id="name_brand_operator_oh">
+        <text key="name" text="Name" />
+        <text key="brand" text="Brand" />
+        <text key="operator" text="Operator" />
+        <reference ref="oh" />
+    </chunk>
+    <chunk id="name_brand_oh">
+        <text key="name" text="Name" />
+        <text key="brand" text="Brand" />
+        <reference ref="oh" />
+    </chunk>
+    <chunk id="internet_smoking_wheelchair">
+        <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+        <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+        <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
+        <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+    </chunk>
+    <chunk id="optional_height">
+        <optional>
+            <text key="height" text="Height (meters)" length="7" />
+        </optional>
+    </chunk>
+    <chunk id="optional_maxwidth">
+        <optional>
+            <text key="maxwidth" text="Max. width (meters)" length="7" />
+        </optional>
+    </chunk>
+    <chunk id="name_leisure_pitch">
+        <text key="name" text="Name" />
+        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
+    </chunk>
   <group name="Highways" icon="presets/way_secondary.png">
     <group name="Streets" icon="presets/way_secondary.png">
         <item name="Motorway" icon="presets/motorway.png" type="way">
@@ -167,18 +285,15 @@ Note that for a match, at least one positive and no negative is required.
             <text key="ref" text="Reference" />
             <optional>
                 <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <reference ref="highway_base" />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
-                    <check key="bridge" text="Bridge" default="off" />
-                    <check key="tunnel" text="Tunnel" default="off" />
-                    <check key="cutting" text="Cutting" default="off" />
-                    <check key="embankment" text="Embankment" default="off" />
-                    <check key="lit" text="Lit" default="off" />
-                    <check key="toll" text="Toll" default="off"  /> 
+                    <check key="bridge" text="Bridge" />
+                    <check key="tunnel" text="Tunnel" />
+                    <check key="cutting" text="Cutting" />
+                    <check key="embankment" text="Embankment" />
+                    <check key="lit" text="Lit" />
+                    <check key="toll" text="Toll" />
                 </checkgroup>
             </optional>
         </item>
@@ -195,10 +310,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Motorway Link" />
             <key key="highway" value="motorway_link" />
             <optional>
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <reference ref="highway_base" />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
                     <check key="bridge" text="Bridge" />
@@ -226,10 +338,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="ref" text="Reference" />
             <optional>
                 <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <reference ref="highway_base" />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
                     <check key="motorroad" text="Motorroad" default="on" />
@@ -255,10 +364,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="highway" value="trunk_link" />
             <text key="ref" text="Reference" />
             <optional>
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <reference ref="highway_base" />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
                     <check key="motorroad" text="Motorroad" default="on" />
@@ -268,7 +374,7 @@ Note that for a match, at least one positive and no negative is required.
                     <check key="embankment" text="Embankment" />
                     <check key="lit" text="Lit" />
                     <check key="toll" text="Toll" />
-                </checkgroup> 
+                </checkgroup>
             </optional>
         </item>
         <separator/>
@@ -288,18 +394,11 @@ Note that for a match, at least one positive and no negative is required.
             <text key="ref" text="Reference" />
             <optional>
                 <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="motorroad" text="Motorroad" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="lit" text="Lit" default="off" /> 
+                <reference ref="highway_base" />
+                <check key="oneway" text="Oneway" />
+                <check key="motorroad" text="Motorroad" />
+                <reference ref="highway_yesno_incline" />
+                <check key="lit" text="Lit" />
             </optional>
         </item>
         <item name="Primary Link" icon="presets/way_primary.png" type="way">
@@ -313,18 +412,11 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Primary Link" />
             <key key="highway" value="primary_link" />
             <optional>
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="motorroad" text="Motorroad" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="lit" text="Lit" default="off" /> 
+                <reference ref="highway_base" />
+                <check key="oneway" text="Oneway" />
+                <check key="motorroad" text="Motorroad" />
+                <reference ref="highway_yesno_incline" />
+                <check key="lit" text="Lit" />
             </optional>
         </item>
         <item name="Secondary" icon="presets/way_secondary.png" type="way">
@@ -344,17 +436,8 @@ Note that for a match, at least one positive and no negative is required.
             <text key="ref" text="Reference" />
             <optional>
                 <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="lit" text="Lit" default="off" /> 
+                <reference ref="highway_base" />
+                <reference ref="highway_yesno_incline_oneway_lit" />
             </optional>
         </item>
         <item name="Secondary Link" icon="presets/way_secondary.png" type="way">
@@ -368,17 +451,8 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Secondary Link" />
             <key key="highway" value="secondary_link" />
             <optional>
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="lit" text="Lit" default="off" /> 
+                <reference ref="highway_base" />
+                <reference ref="highway_yesno_incline_oneway_lit" />
             </optional>
         </item>
         <item name="Tertiary" icon="presets/way_tertiary.png" type="way">
@@ -399,17 +473,8 @@ Note that for a match, at least one positive and no negative is required.
             <text key="ref" text="Reference" />
             <optional>
                 <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="lit" text="Lit" default="off" /> 
+                <reference ref="highway_base" />
+                <reference ref="highway_yesno_incline_oneway_lit" />
             </optional>
         </item>
         <item name="Tertiary Link" icon="presets/way_tertiary.png" type="way">
@@ -423,17 +488,8 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Tertiary Link" />
             <key key="highway" value="tertiary_link" />
             <optional>
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="lit" text="Lit" default="off" /> 
+                <reference ref="highway_base" />
+                <reference ref="highway_yesno_incline_oneway_lit" />
             </optional>
         </item>
         <item name="Unclassified" icon="presets/way_unclassified.png" type="way,closedway">
@@ -451,18 +507,9 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <text key="name" text="Name" />
                 <text key="ref" text="Reference" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="lit" text="Lit" default="off" /> 
-                <check key="passing_places" text="Passing Places" default="off" />
+                <reference ref="highway_base" />
+                <reference ref="highway_yesno_incline_oneway_lit" />
+                <check key="passing_places" text="Passing Places" />
                 <text key="width" text="Width (meters)" />
             </optional>
         </item>
@@ -482,17 +529,8 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
             <optional>
                 <text key="ref" text="Reference" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="lit" text="Lit" default="off" /> 
+                <reference ref="highway_base" />
+                <reference ref="highway_yesno_incline_oneway_lit" />
                 <text key="width" text="Width (meters)" />
             </optional>
         </item>
@@ -511,15 +549,11 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="oneway:bicycle" text="Oneway for bicycle" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="lit" text="Lit" default="off" /> 
+                <reference ref="surface" />
+                <check key="oneway" text="Oneway" />
+                <check key="oneway:bicycle" text="Oneway for bicycle" />
+                <reference ref="highway_yesno_incline" />
+                <check key="lit" text="Lit" />
                 <text key="width" text="Width (meters)" />
             </optional>
         </item>
@@ -539,14 +573,8 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="lit" text="Lit" default="off" /> 
+                <reference ref="surface" />
+                <reference ref="highway_yesno_incline_oneway_lit" />
                 <text key="width" text="Width (meters)" />
             </optional>
         </item>
@@ -568,14 +596,10 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="area" text="Area" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="lit" text="Lit" default="off" /> 
+                <reference ref="surface" />
+                <check key="area" text="Area" />
+                <reference ref="highway_yesno_incline" />
+                <check key="lit" text="Lit" />
                 <text key="width" text="Width (meters)" />
             </optional>
         </item>
@@ -594,18 +618,9 @@ Note that for a match, at least one positive and no negative is required.
             <combo key="service" text="Service way type" values="alley,driveway,parking_aisle,drive-through" />
             <optional>
                 <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="lit" text="Lit" default="off" /> 
-                <check key="passing_places" text="Passing Places" default="off" />
+                <reference ref="highway_base" />
+                <reference ref="highway_yesno_incline_oneway_lit" />
+                <check key="passing_places" text="Passing Places" />
                 <text key="width" text="Width (meters)" />
             </optional>
         </item>
@@ -622,9 +637,9 @@ Note that for a match, at least one positive and no negative is required.
             <key key="highway" value="service" />
             <key key="service" value="parking_aisle" />
             <optional>
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="lit" text="Lit" default="off" /> 
+                <reference ref="surface" />
+                <check key="oneway" text="Oneway" />
+                <check key="lit" text="Lit" />
             </optional>
         </item>
         <item name="Road (Unknown Type)" icon="presets/way_unclassified.png" type="way,closedway">
@@ -640,18 +655,8 @@ Note that for a match, at least one positive and no negative is required.
             <key key="highway" value="road" />
             <optional>
                 <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="lit" text="Lit" default="off" /> 
-                <text key="width" text="Width (meters)" />
+                <reference ref="highway_base" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
         </item>
         <item name="Construction" icon="presets/construction.png" type="way,closedway">
@@ -666,17 +671,8 @@ Note that for a match, at least one positive and no negative is required.
             <key key="highway" value="construction" />
             <optional>
                 <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="lit" text="Lit" default="off" /> 
+                <reference ref="highway_base" />
+                <reference ref="highway_yesno_incline_oneway_lit" />
                 <combo key="junction" text="Junction" values="roundabout,jughandle,yes" />
                 <text key="width" text="Width (meters)" />
             </optional>
@@ -696,9 +692,9 @@ Note that for a match, at least one positive and no negative is required.
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:access" />
             <label text="Edit Road Restrictions" />
             <space />
-            <check key="oneway" text="Oneway" default="off" />
-            <check key="toll" text="Toll" default="off"  />
-            <check key="noexit" text="No exit (cul-de-sac)" default="off"  />
+            <check key="oneway" text="Oneway" />
+            <check key="toll" text="Toll" />
+            <check key="noexit" text="No exit (cul-de-sac)" />
             <label text="Transport mode restrictions" />
             <space />
             <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" match="key" values_searchable="true" />
@@ -746,15 +742,9 @@ Note that for a match, at least one positive and no negative is required.
             <key key="junction" value="roundabout" />
             <combo key="highway" text="Type" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" />
             <optional>
-                <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+                <reference ref="name_layer" />
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+                <reference ref="highway_yesno_incline_oneway" />
                 <text key="width" text="Width (meters)" />
             </optional>
         </item>
@@ -815,16 +805,9 @@ Note that for a match, at least one positive and no negative is required.
             <combo key="tracktype" text="Tracktype" values="grade1,grade2,grade3,grade4,grade5" />
             <key key="highway" value="track" />
             <optional>
-                <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+                <reference ref="name_layer" />
                 <combo key="surface" text="Surface" values="paved,concrete,cobblestone,gravel,ground,grass,sand" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="lit" text="Lit" default="off" /> 
+                <reference ref="highway_yesno_incline_oneway_lit" />
                 <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
                 <combo key="access" text="General access" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
@@ -847,16 +830,9 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Path" />
             <key key="highway" value="path" />
             <optional>
-                <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="lit" text="Lit" default="off" /> 
+                <reference ref="name_layer" />
+                <reference ref="surface" />
+                <reference ref="highway_yesno_incline_oneway_lit" />
                 <combo key="sac_scale" text="SAC Scale" values_searchable="true">
                     <list_entry value="hiking" display_value="T1 - hiking trail" short_description="Trail well cleared. Area flat or slightly sloped, no fall hazard" />
                     <list_entry value="mountain_hiking" display_value="T2 - mountain hiking trail" short_description="Trail with continuous line and balanced ascent. Terrain partially steep, fall hazard possible" />
@@ -888,17 +864,10 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Bridleway" />
             <key key="highway" value="bridleway" />
             <optional>
-                <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+                <reference ref="name_layer" />
                 <text key="maxspeed" text="Max. speed (km/h)" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="lit" text="Lit" default="off" /> 
+                <reference ref="surface" />
+                <reference ref="highway_yesno_incline_oneway_lit" />
                 <text key="width" text="Width (meters)" />
             </optional>
         </item>
@@ -918,11 +887,11 @@ Note that for a match, at least one positive and no negative is required.
             <combo key="cycleway" text="Cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" />
             <combo key="cycleway:left" text="Cycleway left" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" />
             <combo key="cycleway:right" text="Cycleway right" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" />
-            <check key="oneway:bicycle" text="Oneway (bicycle)" default="off" />
+            <check key="oneway:bicycle" text="Oneway (bicycle)" />
             <space />
             <optional text="Edit Highway Attributes:">
                 <combo key="highway" text="Highway" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" />
-                <check key="oneway" text="Oneway" default="off" />
+                <check key="oneway" text="Oneway" />
             </optional>
         </item>
         <item name="Dedicated Cycleway" icon="presets/cycleway.png" type="way">
@@ -937,16 +906,9 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Cycleway" />
             <key key="highway" value="cycleway" />
             <optional>
-                <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="lit" text="Lit" default="off" /> 
+                <reference ref="name_layer" />
+                <reference ref="surface" />
+                <reference ref="highway_yesno_incline_oneway_lit" />
                 <combo key="foot" text="Pedestrians" values="unknown,yes,no" />
                 <text key="width" text="Width (meters)" />
             </optional>
@@ -961,16 +923,9 @@ Note that for a match, at least one positive and no negative is required.
             <key key="foot" value="designated" />
             <key key="segregated" value="yes" />
             <optional>
-                <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="lit" text="Lit" default="off" /> 
+                <reference ref="name_layer" />
+                <reference ref="surface" />
+                <reference ref="highway_yesno_incline_oneway_lit" />
                 <text key="width" text="Width (meters)" />
             </optional>
         </item>
@@ -984,17 +939,10 @@ Note that for a match, at least one positive and no negative is required.
             <key key="foot" value="designated" />
             <key key="segregated" value="no" />
             <optional>
-                <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="lit" text="Lit" default="off" /> 
-                <check key="passing_places" text="Passing Places" default="off" />
+                <reference ref="name_layer" />
+                <reference ref="surface" />
+                <reference ref="highway_yesno_incline_oneway_lit" />
+                <check key="passing_places" text="Passing Places" />
                 <text key="width" text="Width (meters)" />
             </optional>
         </item>
@@ -1012,16 +960,11 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Footway" />
             <key key="highway" value="footway" />
             <optional>
-                <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="lit" text="Lit" default="off" /> 
-                <check key="bicycle" text="Bicycle" default="off" />
+                <reference ref="name_layer" />
+                <reference ref="surface" />
+                <reference ref="highway_yesno_incline" />
+                <check key="lit" text="Lit" />
+                <check key="bicycle" text="Bicycle" />
                 <text key="width" text="Width (meters)" />
             </optional>
         </item>
@@ -1036,16 +979,10 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Flight of Steps" />
             <key key="highway" value="steps" />
             <optional>
-                <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <reference ref="name_layer" />
+                <reference ref="surface" />
                 <text key="step_count" text="Amount of Steps" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <check key="lit" text="Lit" default="off" /> 
+                <reference ref="highway_yesno_incline_oneway_lit" />
                 <text key="width" text="Width (meters)" />
             </optional>
         </item>
@@ -1077,7 +1014,7 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <text key="name" text="Name" />
                 <text key="operator" text="Operator" />
-                <check key="toilets" text="Toilets" default="off" />
+                <check key="toilets" text="Toilets" />
             </optional>
         </item>
         <item name="Rest Area" icon="presets/parking.png" type="node,closedway">
@@ -1093,8 +1030,8 @@ Note that for a match, at least one positive and no negative is required.
             <key key="highway" value="rest_area" />
             <optional>
                 <text key="name" text="Name" />
-                <check key="toilets" text="Toilets" default="off" />
-                <check key="drinking_water" text="Drinking Water" default="off" />
+                <check key="toilets" text="Toilets" />
+                <check key="drinking_water" text="Drinking Water" />
             </optional>
         </item>
         <separator/>
@@ -1109,9 +1046,9 @@ Note that for a match, at least one positive and no negative is required.
             <optional text="Optional crossing attributes:">
                  <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
                  <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
-                 <check key="supervised" text="Crossing attendant" default="off" />
-                 <check key="bicycle" text="Cross by bicycle" default="off" />
-                 <check key="horse" text="Cross on horseback" default="off" />
+                 <check key="supervised" text="Crossing attendant" />
+                 <check key="bicycle" text="Cross by bicycle" />
+                 <check key="horse" text="Cross on horseback" />
             </optional>
         </item>
         <item name="Stop" icon="presets/Stop.png" type="node">
@@ -1146,9 +1083,9 @@ Note that for a match, at least one positive and no negative is required.
             <key key="highway" value="crossing" />
             <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
             <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" values_searchable="true" />
-            <check key="supervised" text="Crossing attendant" default="off" />
-            <check key="bicycle" text="Cross by bicycle" default="off" />
-            <check key="horse" text="Cross on horseback" default="off" />
+            <check key="supervised" text="Crossing attendant" />
+            <check key="bicycle" text="Cross by bicycle" />
+            <check key="horse" text="Cross on horseback" />
         </item>
         <item name="Traffic Calming" icon="presets/chicane.png" type="node,way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"
@@ -1234,12 +1171,7 @@ Note that for a match, at least one positive and no negative is required.
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=block" />
             <label text="Edit Block" />
             <key key="barrier" value="block" />
-            <optional text="Allowed traffic:">
-                <check key="foot" text="Foot" default="on" />
-                <check key="bicycle" text="Bicycle" default="on" />
-                <check key="horse" text="Horse" default="off" />
-                <check key="motorcycle" text="Motorcycle" default="off" />
-            </optional>
+            <reference ref="barrier_4" />
             <optional>
                 <text key="maxwidth" text="Max. width (meters)" length="7" />
                 <combo key="material" text="Material" values="concrete,stone" />
@@ -1257,12 +1189,7 @@ Note that for a match, at least one positive and no negative is required.
             <space />
             <key key="barrier" value="bollard" />
             <combo key="bollard" text="Bollard type" values="rising,removable" />
-            <optional text="Allowed traffic:">
-                <check key="foot" text="Foot" default="on" />
-                <check key="bicycle" text="Bicycle" default="on" />
-                <check key="horse" text="Horse" default="off" />
-                <check key="motorcycle" text="Motorcycle" default="off" />
-            </optional>
+            <reference ref="barrier_4" />
             <optional>
                 <text key="maxwidth" text="Max. width (meters)" length="7" />
                 <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
@@ -1275,46 +1202,26 @@ Note that for a match, at least one positive and no negative is required.
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=cycle_barrier" />
             <label text="Edit Cycle Barrier" />
             <key key="barrier" value="cycle_barrier" />
-            <optional text="Allowed traffic:">
-                <check key="foot" text="Foot" default="on" />
-                <check key="bicycle" text="Bicycle" default="on" />
-                <check key="horse" text="Horse" default="off" />
-                <check key="motorcycle" text="Motorcycle" default="off" />
-            </optional>
-            <optional>
-                <text key="maxwidth" text="Max. width (meters)" length="7" />
-            </optional>
+            <reference ref="barrier_4" />
+            <reference ref="optional_maxwidth" />
         </item> <!-- cycle_barrier -->
         <item name="Cattle Grid" icon="presets/cattle_grid.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
             <label text="Edit Cattle Grid" />
             <key key="barrier" value="cattle_grid" />
-            <optional text="Allowed traffic:">
-                <check key="foot" text="Foot" default="on" />
-                <check key="bicycle" text="Bicycle" default="on" />
-                <check key="motorcycle" text="Motorcycle" default="off" />
-                <check key="motorcar" text="Motorcar" default="off" />
-            </optional>
+            <reference ref="barrier_4" />
         </item> <!-- cattle_grid -->
         <item name="Bus Trap" icon="presets/empty.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bus_trap"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=bus_trap" />
             <label text="Edit Bus Trap" />
             <key key="barrier" value="bus_trap" />
-            <optional>
-                <text key="maxwidth" text="Max. width (meters)" length="7" />
-            </optional>
+            <reference ref="optional_maxwidth" />
         </item> <!-- bus_trap -->
         <item name="Spikes" icon="presets/empty.png" type="node">
             <label text="Edit Spikes" />
             <key key="barrier" value="spikes" />
-            <optional text="Allowed traffic:">
-                <check key="foot" text="Foot" default="on" />
-                <check key="bicycle" text="Bicycle" default="on" />
-                <check key="horse" text="Horse" default="off" />
-                <check key="motorcycle" text="Motorcycle" default="off" />
-                <check key="motorcar" text="Motorcar" default="off" />
-            </optional>
+            <reference ref="barrier_5" />
         </item> <!-- spikes -->
         <item name="Toll Booth" icon="presets/toll_station.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth"
@@ -1335,13 +1242,7 @@ Note that for a match, at least one positive and no negative is required.
         <item name="Border Control" icon="presets/douane.png" type="node">
             <label text="Edit Border Control" />
             <key key="barrier" value="border_control" />
-            <optional text="Allowed traffic:">
-                <check key="foot" text="Foot" default="on" />
-                <check key="bicycle" text="Bicycle" default="on" />
-                <check key="horse" text="Horse" default="off" />
-                <check key="motorcycle" text="Motorcycle" default="off" />
-                <check key="motorcar" text="Motorcar" default="off" />
-            </optional>
+            <reference ref="barrier_5" />
         </item> <!-- border_control -->
         <separator/> <!-- *** linear barriers *** -->
         <item name="Hedge" icon="presets/hedge.png" type="way,closedway,relation">
@@ -1383,9 +1284,7 @@ Note that for a match, at least one positive and no negative is required.
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=guard_rail" />
             <label text="Edit Guard Rail" />
             <key key="barrier" value="guard_rail" />
-            <optional>
-                <text key="height" text="Height (meters)" length="7" />
-            </optional>
+            <reference ref="optional_height" />
         </item> <!-- guard_rail -->
         <item name="Wall" icon="presets/wall.png" type="way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=wall"
@@ -1398,9 +1297,7 @@ Note that for a match, at least one positive and no negative is required.
                   zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Tag:barrier=wall" />
             <label text="Edit Wall" />
             <key key="barrier" value="wall" />
-            <optional>
-                <text key="height" text="Height (meters)" length="7" />
-            </optional>
+            <reference ref="optional_height" />
         </item> <!-- wall -->
         <item name="City Wall" icon="presets/city_wall.png" type="way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall"
@@ -1409,9 +1306,7 @@ Note that for a match, at least one positive and no negative is required.
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=city_wall" />
             <label text="Edit City Wall" />
             <key key="barrier" value="city_wall" />
-            <optional>
-                <text key="height" text="Height (meters)" length="7" />
-            </optional>
+            <reference ref="optional_height" />
         </item> <!-- city_wall -->
         <item name="Retaining Wall" icon="presets/retaining_wall.png" type="way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall"
@@ -1423,9 +1318,7 @@ Note that for a match, at least one positive and no negative is required.
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=retaining_wall" />
             <label text="Edit Retaining Wall" />
             <key key="barrier" value="retaining_wall" />
-            <optional>
-                <text key="height" text="Height (meters)" length="7" />
-            </optional>
+            <reference ref="optional_height" />
         </item> <!-- retaining_wall -->
         <item name="Ditch" name_context="Barrier" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=ditch"
@@ -1442,9 +1335,7 @@ Note that for a match, at least one positive and no negative is required.
         <item name="Kerb" type="way,closedway">
             <label text="Edit Kerb" />
             <key key="barrier" value="kerb" />
-            <optional>
-                <text key="height" text="Height (meters)" length="7" />
-            </optional>
+            <reference ref="optional_height" />
         </item> <!-- kerb -->
         <separator/> <!-- *** access *** -->
         <item name="Entrance (barrier opening)" icon="styles/standard/vehicle/entrance.png" type="node">
@@ -1453,16 +1344,8 @@ Note that for a match, at least one positive and no negative is required.
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=entrance" />
             <label text="Edit Entrance (barrier opening)" />
             <key key="barrier" value="entrance" />
-            <optional text="Allowed traffic:">
-                <check key="foot" text="Foot" default="on" />
-                <check key="bicycle" text="Bicycle" default="on" />
-                <check key="horse" text="Horse" default="off" />
-                <check key="motorcycle" text="Motorcycle" default="off" />
-                <check key="motorcar" text="Motorcar" default="off" />
-            </optional>
-            <optional>
-                <text key="maxwidth" text="Max. width (meters)" length="7" />
-            </optional>
+            <reference ref="barrier_5" />
+            <reference ref="optional_maxwidth" />
         </item> <!-- entrance -->
         <item name="Gate" icon="presets/gate.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate"
@@ -1474,16 +1357,8 @@ Note that for a match, at least one positive and no negative is required.
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=gate" />
             <label text="Edit Gate" />
             <key key="barrier" value="gate" />
-            <optional text="Allowed traffic:">
-                <check key="foot" text="Foot" default="on" />
-                <check key="bicycle" text="Bicycle" default="on" />
-                <check key="horse" text="Horse" default="off" />
-                <check key="motorcycle" text="Motorcycle" default="off" />
-                <check key="motorcar" text="Motorcar" default="off" />
-            </optional>
-            <optional>
-                <text key="maxwidth" text="Max. width (meters)" length="7" />
-            </optional>
+            <reference ref="barrier_5" />
+            <reference ref="optional_maxwidth" />
         </item> <!-- gate -->
         <item name="Lift Gate" icon="presets/lift_gate.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=lift_gate"
@@ -1494,72 +1369,35 @@ Note that for a match, at least one positive and no negative is required.
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=lift_gate" />
             <label text="Edit Lift Gate" />
             <key key="barrier" value="lift_gate" />
-            <optional text="Allowed traffic:">
-                <check key="foot" text="Foot" default="on" />
-                <check key="bicycle" text="Bicycle" default="on" />
-                <check key="horse" text="Horse" default="off" />
-                <check key="motorcycle" text="Motorcycle" default="off" />
-                <check key="motorcar" text="Motorcar" default="off" />
-            </optional>
-            <optional>
-                <text key="maxwidth" text="Max. width (meters)" length="7" />
-            </optional>
+            <reference ref="barrier_5" />
+            <reference ref="optional_maxwidth" />
         </item> <!-- lift_gate -->
         <item name="Hampshire Gate" icon="presets/empty.png" type="node">
             <label text="Edit Hampshire Gate" />
             <key key="barrier" value="hampshire_gate" />
-            <optional text="Allowed traffic:">
-                <check key="foot" text="Foot" default="on" />
-                <check key="bicycle" text="Bicycle" default="on" />
-                <check key="horse" text="Horse" default="off" />
-                <check key="motorcycle" text="Motorcycle" default="off" />
-                <check key="motorcar" text="Motorcar" default="off" />
-            </optional>
-            <optional>
-                <text key="maxwidth" text="Max. width (meters)" length="7" />
-            </optional>
+            <reference ref="barrier_5" />
+            <reference ref="optional_maxwidth" />
         </item> <!-- hampshire_gate -->
         <item name="Bump Gate" icon="presets/empty.png" type="node">
             <label text="Edit Bump Gate" />
             <key key="barrier" value="bump_gate" />
-            <optional text="Allowed traffic:">
-                <check key="foot" text="Foot" default="on" />
-                <check key="bicycle" text="Bicycle" default="on" />
-                <check key="horse" text="Horse" default="off" />
-                <check key="motorcycle" text="Motorcycle" default="off" />
-                <check key="motorcar" text="Motorcar" default="off" />
-            </optional>
-            <optional>
-                <text key="maxwidth" text="Max. width (meters)" length="7" />
-            </optional>
+            <reference ref="barrier_5" />
+            <reference ref="optional_maxwidth" />
         </item> <!-- bump_gate -->
         <item name="Kissing Gate" icon="presets/empty.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=kissing_gate" />
             <label text="Edit Kissing Gate" />
             <key key="barrier" value="kissing_gate" />
-            <optional text="Allowed traffic:">
-                <check key="foot" text="Foot" default="on" />
-                <check key="bicycle" text="Bicycle" default="off" />
-            </optional>
-            <optional>
-                <text key="maxwidth" text="Max. width (meters)" length="7" />
-            </optional>
+            <reference ref="barrier_2" />
+            <reference ref="optional_maxwidth" />
         </item> <!-- kissing_gate -->
         <item name="Chain" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=chain"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=chain" />
             <label text="Edit Chain" />
             <key key="barrier" value="chain" />
-            <optional text="Allowed traffic:">
-                <check key="foot" text="Foot" default="on" />
-                <check key="bicycle" text="Bicycle" default="on" />
-                <check key="horse" text="Horse" default="off" />
-                <check key="motorcycle" text="Motorcycle" default="off" />
-                <check key="motorcar" text="Motorcar" default="off" />
-            </optional>
-            <optional>
-                <text key="maxwidth" text="Max. width (meters)" length="7" />
-            </optional>
+            <reference ref="barrier_5" />
+            <reference ref="optional_maxwidth" />
         </item> <!-- chain -->
         <item name="Stile" icon="presets/stile.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
@@ -1570,10 +1408,7 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <combo key="material" text="Material" values="metal,stone,wood" />
             </optional>
-            <optional text="Allowed traffic:">
-                <check key="foot" text="Foot" default="on" />
-                <check key="bicycle" text="Bicycle" default="off" />
-            </optional>
+            <reference ref="barrier_2" />
         </item> <!-- stile -->
         <item name="Turnstile" icon="styles/standard/vehicle/turnstile.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile"
@@ -1581,22 +1416,13 @@ Note that for a match, at least one positive and no negative is required.
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=stile" />
             <label text="Edit Turnstile" />
             <key key="barrier" value="turnstile" />
-            <optional text="Allowed traffic:">
-                <check key="foot" text="Foot" default="on" />
-                <check key="bicycle" text="Bicycle" default="off" />
-            </optional>
+            <reference ref="barrier_2" />
         </item> <!-- turnstile -->
         <item name="Sally Port" icon="styles/standard/vehicle/sally_port.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=sally_port" />
             <label text="Edit Sally Port" />
             <key key="barrier" value="sally_port" />
-            <optional text="Allowed traffic:">
-                <check key="foot" text="Foot" default="on" />
-                <check key="bicycle" text="Bicycle" default="on" />
-                <check key="horse" text="Horse" default="off" />
-                <check key="motorcycle" text="Motorcycle" default="off" />
-                <check key="motorcar" text="Motorcar" default="off" />
-            </optional>
+            <reference ref="barrier_5" />
             <optional>
                 <text key="maxheight" text="Max. height (meters)" length="7" />
                 <text key="maxwidth" text="Max. width (meters)" length="7" />
@@ -1619,8 +1445,8 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <text key="name" text="Name" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" length="3" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
                 <text key="width" text="Width (meters)" />
+                <text key="maxspeed" text="Max. speed (km/h)" />
                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
                 <check key="toll" text="Toll" />
             </optional>
@@ -1638,10 +1464,9 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Building Passage" />
             <key key="tunnel" value="building_passage" />
             <optional>
-                <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
+                <reference ref="name_layer" />
                 <text key="width" text="Width (meters)" />
+                <text key="maxspeed" text="Max. speed (km/h)" />
                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
         </item>
@@ -1659,8 +1484,7 @@ Note that for a match, at least one positive and no negative is required.
             <check key="arcade:left" value_on="open" text="Open on left side" />
             <check key="arcade:right" value_on="open" text="Open on right side" />
             <optional>
-                <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+                <reference ref="name_layer" />
                 <text key="width" text="Width (meters)" />
             </optional>
         </item>
@@ -1676,8 +1500,7 @@ Note that for a match, at least one positive and no negative is required.
             <check key="colonnade:left" value_on="open" text="Open on left side" />
             <check key="colonnade:right" value_on="open" text="Open on right side" />
             <optional>
-                <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+                <reference ref="name_layer" />
                 <text key="width" text="Width (meters)" />
             </optional>
         </item>
@@ -1697,8 +1520,7 @@ Note that for a match, at least one positive and no negative is required.
             <check key="avalanche_protector:left" value_on="open" text="Open on left side" />
             <check key="avalanche_protector:right" value_on="open" text="Open on right side" />
             <optional>
-                <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+                <reference ref="name_layer" />
                 <text key="width" text="Width (meters)" />
                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
@@ -1829,7 +1651,7 @@ Note that for a match, at least one positive and no negative is required.
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=groyne"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=groyne"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=groyne" />
-            <key key="man_made" value="groyne" />                               
+            <key key="man_made" value="groyne" />
         </item>
         <item name="Breakwater" icon="presets/groyne.png" type="way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=breakwater"
@@ -2184,16 +2006,11 @@ Note that for a match, at least one positive and no negative is required.
             <key key="highway" value="bus_guideway" />
             <optional>
                 <text key="name" text="Name" />
-                <check key="oneway" text="Oneway" default="off" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
+                <reference ref="highway_yesno_incline_oneway" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <reference ref="surface" />
                 <text key="maxspeed" text="Max. speed (km/h)" />
                 <text key="width" text="Width (meters)" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
         </item>
         <separator/>
@@ -2231,9 +2048,9 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Level Crossing" />
             <key key="railway" value="level_crossing" />
             <optional>
-                <check key="supervised" text="Supervised" default="off" />
-                <check key="crossing:light" text="Traffic lights" default="off" />
-                <check key="crossing:bell" text="Sound signals" default="off" />
+                <check key="supervised" text="Supervised" />
+                <check key="crossing:light" text="Traffic lights" />
+                <check key="crossing:bell" text="Sound signals" />
                 <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
             </optional>
         </item>
@@ -2249,11 +2066,11 @@ Note that for a match, at least one positive and no negative is required.
             <key key="railway" value="crossing" />
             <optional>
                 <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
-                <check key="horse" text="Cross on horseback" default="off" />
-                <check key="bicycle" text="Cross by bicycle" default="off" />
-                <check key="supervised" text="Supervised" default="off" />
-                <check key="crossing:light" text="Traffic lights" default="off" />
-                <check key="crossing:bell" text="Sound signals" default="off" />
+                <check key="horse" text="Cross on horseback" />
+                <check key="bicycle" text="Cross by bicycle" />
+                <check key="supervised" text="Supervised" />
+                <check key="crossing:light" text="Traffic lights" />
+                <check key="crossing:bell" text="Sound signals" />
                 <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
             </optional>
         </item>
@@ -2276,14 +2093,13 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Chair Lift" />
             <space />
             <key key="aerialway" value="chair_lift" />
-            <text key="name" text="Name" />
-            <text key="ref" text="Reference number" />
+            <reference ref="name_ref" />
             <optional>
                 <text key="aerialway:capacity" text="Number of people per hour" />
                 <text key="aerialway:occupancy" text="Number of people per chair" />
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
-                <check key="aerialway:bubble" text="Has bubble?" default="off" />
-                <check key="aerialway:heating" text="Has heating?" default="off" />
+                <check key="aerialway:bubble" text="Has bubble?" />
+                <check key="aerialway:heating" text="Has heating?" />
             </optional>
         </item>
         <item name="Drag Lift" icon="presets/drag_lift.png" type="way">
@@ -2291,8 +2107,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Drag Lift" />
             <space />
             <key key="aerialway" value="drag_lift" />
-            <text key="name" text="Name" />
-            <text key="ref" text="Reference number" />
+            <reference ref="name_ref" />
             <optional>
                 <text key="aerialway:capacity" text="Number of people per hour" />
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
@@ -2308,13 +2123,12 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Cable Car" />
             <space />
             <key key="aerialway" value="cable_car" />
-            <text key="name" text="Name" />
-            <text key="ref" text="Reference number" />
+            <reference ref="name_ref" />
             <optional>
                 <text key="aerialway:capacity" text="Number of people per hour" />
                 <text key="aerialway:occupancy" text="Number of people per car" />
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
-                <check key="aerialway:heating" text="Has heating?" default="off" />
+                <check key="aerialway:heating" text="Has heating?" />
             </optional>
         </item>
         <item name="Gondola" icon="presets/gondola.png" type="way">
@@ -2325,13 +2139,12 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Gondola" />
             <space />
             <key key="aerialway" value="gondola" />
-            <text key="name" text="Name" />
-            <text key="ref" text="Reference number" />
+            <reference ref="name_ref" />
             <optional>
                 <text key="aerialway:capacity" text="Number of people per hour" />
                 <text key="aerialway:occupancy" text="Number of people per gondola" />
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
-                <check key="aerialway:heating" text="Has heating?" default="off" />
+                <check key="aerialway:heating" text="Has heating?" />
             </optional>
         </item>
         <item name="Mixed Lift" type="way">
@@ -2339,14 +2152,13 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Mixed Lift (containing both gondolas and chairs)" />
             <space />
             <key key="aerialway" value="mixed_lift" />
-            <text key="name" text="Name" />
-            <text key="ref" text="Reference number" />
+            <reference ref="name_ref" />
             <optional>
                 <text key="aerialway:capacity" text="Number of people per hour" />
                 <text key="aerialway:occupancy" text="Number of people per gondola/chair" />
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
-                <check key="aerialway:bubble" text="Has bubble?" default="off" />
-                <check key="aerialway:heating" text="Has heating?" default="off" />
+                <check key="aerialway:bubble" text="Has bubble?" />
+                <check key="aerialway:heating" text="Has heating?" />
             </optional>
         </item>
         <item name="T-bar Lift" icon="presets/drag_lift.png" type="way">
@@ -2357,8 +2169,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit T-bar Lift" />
             <space />
             <key key="aerialway" value="t-bar" />
-            <text key="name" text="Name" />
-            <text key="ref" text="Reference number" />
+            <reference ref="name_ref" />
             <optional>
                 <text key="aerialway:capacity" text="Number of people per hour" />
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
@@ -2369,8 +2180,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit J-bar Lift" />
             <space />
             <key key="aerialway" value="j-bar" />
-            <text key="name" text="Name" />
-            <text key="ref" text="Reference number" />
+            <reference ref="name_ref" />
             <optional>
                 <text key="aerialway:capacity" text="Number of people per hour" />
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
@@ -2381,8 +2191,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Platter Lift" />
             <space />
             <key key="aerialway" value="platter" />
-            <text key="name" text="Name" />
-            <text key="ref" text="Reference number" />
+            <reference ref="name_ref" />
             <optional>
                 <text key="aerialway:capacity" text="Number of people per hour" />
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
@@ -2393,8 +2202,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Rope Tow" />
             <space />
             <key key="aerialway" value="rope_tow" />
-            <text key="name" text="Name" />
-            <text key="ref" text="Reference number" />
+            <reference ref="name_ref" />
             <optional>
                 <text key="aerialway:capacity" text="Number of people per hour" />
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
@@ -2405,8 +2213,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Magic Carpet" />
             <space />
             <key key="aerialway" value="magic_carpet" />
-            <text key="name" text="Name" />
-            <text key="ref" text="Reference number" />
+            <reference ref="name_ref" />
             <optional>
                 <text key="aerialway:capacity" text="Number of people per hour" />
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
@@ -2416,8 +2223,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Goods" />
             <space />
             <key key="aerialway" value="goods" />
-            <text key="name" text="Name" />
-            <text key="ref" text="Reference number" />
+            <reference ref="name_ref" />
             <optional>
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
             </optional>
@@ -2487,12 +2293,12 @@ Note that for a match, at least one positive and no negative is required.
             <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
             <combo key="fee" text="Fee" values="yes,no,interval" />
             <text key="operator" text="Operator" />
-            <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+            <reference ref="surface" />
             <combo key="covered" text="Covered (with roof)" values="yes,no" />
             <combo key="stay" text="Time Limit (minutes)" values="0,30-60,30-180,30+" />
             <combo key="supervised" text="Supervised" values="yes,no,interval" />
             <combo key="lit" text="Lit" values="yes,no,interval" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="oh" />
         </item>
         <item name="Parking entrance" icon="presets/parking.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking_entrance"
@@ -2510,12 +2316,12 @@ Note that for a match, at least one positive and no negative is required.
             <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
             <combo key="fee" text="Fee" values="yes,no,interval" />
             <text key="operator" text="Operator" />
-            <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+            <reference ref="surface" />
             <combo key="covered" text="Covered (with roof)" values="yes,no" />
             <combo key="stay" text="Time Limit (minutes)" values="0,30-60,30-180,30+" />
             <combo key="supervised" text="Supervised" values="yes,no,interval" />
             <combo key="lit" text="Lit" values="yes,no,interval" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="oh" />
         </item>
         <separator/>
         <item name="Fuel" icon="presets/fuel.png" type="node,closedway">
@@ -2537,26 +2343,26 @@ Note that for a match, at least one positive and no negative is required.
             <optional>
                 <text key="name" text="Name" />
                 <text key="operator" text="Operator" />
-                <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+                <reference ref="oh" />
                 <combo key="shop" text="With shop" values="yes,convenience,kiosk,no" />
                 <label text="Fuel types:" />
                 <checkgroup columns="2">
-                    <check key="fuel:diesel" text="Diesel" default="off" />
-                    <check key="fuel:biodiesel" text="Bio Diesel" default="off" />
-                    <check key="fuel:GTL_diesel" text="Diesel (Gas To Liquid - ultimate diesel)" default="off" />
-                    <check key="fuel:HGV_diesel" text="Diesel for Heavy Good Vehicles" default="off" />
-                    <check key="fuel:octane_80" text="Octane 80" default="off" />
-                    <check key="fuel:octane_91" text="Octane 91" default="off" />
-                    <check key="fuel:octane_92" text="Octane 92" default="off" />
-                    <check key="fuel:octane_95" text="Octane 95" default="off" />
-                    <check key="fuel:octane_98" text="Octane 98" default="off" />
-                    <check key="fuel:octane_100" text="Octane 100" default="off" />
-                    <check key="fuel:e10" text="E10 (10% Ethanol mix)" default="off" />
-                    <check key="fuel:e85" text="E85 (85% Ethanol mix)" default="off" />
-                    <check key="fuel:lpg" text="LPG (Liquefied petroleum gas)" default="off" />
-                    <check key="fuel:cng" text="CNG (Compressed Natural Gas)" default="off" />
-                    <check key="fuel:1_25" text="1/25 mix (mofa/moped)" default="off" />
-                    <check key="fuel:1_50" text="1/50 mix (mofa/moped)" default="off" />
+                    <check key="fuel:diesel" text="Diesel" />
+                    <check key="fuel:biodiesel" text="Bio Diesel" />
+                    <check key="fuel:GTL_diesel" text="Diesel (Gas To Liquid - ultimate diesel)" />
+                    <check key="fuel:HGV_diesel" text="Diesel for Heavy Good Vehicles" />
+                    <check key="fuel:octane_80" text="Octane 80" />
+                    <check key="fuel:octane_91" text="Octane 91" />
+                    <check key="fuel:octane_92" text="Octane 92" />
+                    <check key="fuel:octane_95" text="Octane 95" />
+                    <check key="fuel:octane_98" text="Octane 98" />
+                    <check key="fuel:octane_100" text="Octane 100" />
+                    <check key="fuel:e10" text="E10 (10% Ethanol mix)" />
+                    <check key="fuel:e85" text="E85 (85% Ethanol mix)" />
+                    <check key="fuel:lpg" text="LPG (Liquefied petroleum gas)" />
+                    <check key="fuel:cng" text="CNG (Compressed Natural Gas)" />
+                    <check key="fuel:1_25" text="1/25 mix (mofa/moped)" />
+                    <check key="fuel:1_50" text="1/50 mix (mofa/moped)" />
                 </checkgroup>
             </optional>
         </item>
@@ -2568,15 +2374,12 @@ Note that for a match, at least one positive and no negative is required.
             <text key="operator" text="Operator" />
             <text key="voltage" text="Voltage" />
             <text key="amperage" text="Amperage" />
-        </item>            
+        </item>
         <item name="Wash" icon="presets/car_wash.png" type="node,closedway">
             <label text="Edit Car Wash" />
             <space />
             <key key="amenity" value="car_wash" />
-            <text key="name" text="Name" />
-            <text key="brand" text="Brand" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_brand_operator_oh" />
         </item>
         <separator/>
         <item name="Car Dealer" icon="presets/car.png" type="node,closedway">
@@ -2590,19 +2393,13 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Car Shop" />
             <space />
             <key key="shop" value="car" />
-            <text key="name" text="Name" />
-            <text key="brand" text="Brand" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_brand_operator_oh" />
         </item>
         <item name="Repair" icon="presets/car_repair.png" type="node,closedway">
             <label text="Edit Car Repair" />
             <space />
             <key key="shop" value="car_repair" />
-            <text key="name" text="Name" />
-            <text key="brand" text="Brand" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_brand_operator_oh" />
         </item>
         <item name="Parts" icon="presets/car_repair.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car_parts"
@@ -2610,19 +2407,13 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Car Parts" />
             <space />
             <key key="shop" value="car_parts" />
-            <text key="name" text="Name" />
-            <text key="brand" text="Brand" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_brand_operator_oh" />
         </item>
         <item name="Tyres" icon="presets/tyres.png" type="node,closedway">
             <label text="Edit Tyres" />
             <space />
             <key key="shop" value="tyres" />
-            <text key="name" text="Name" />
-            <text key="brand" text="Brand" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_brand_operator_oh" />
             <label text="Contact:" />
                 <text key="phone" text="Phone Number" />
                 <text key="fax" text="Fax Number" />
@@ -2639,10 +2430,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Car Rental" />
             <space />
             <key key="amenity" value="car_rental" />
-            <text key="name" text="Name" />
-            <text key="brand" text="Brand" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_brand_operator_oh" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
         </item>
         <item name="Sharing" icon="presets/car_sharing.png" type="node,closedway">
@@ -2658,8 +2446,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="amenity" value="car_sharing" />
             <text key="operator" text="Operator" />
             <text key="capacity" text="Capacity" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
             <text key="website" text="Website" />
         </item>
     </group> <!-- Car -->
@@ -2684,7 +2471,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
             <combo key="brand" text="Brand" values="independent" />
             <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="oh" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
             <optional text="Services:">
                 <combo key="sale" text="Sale" values="yes,brand,no" />
@@ -2717,12 +2504,11 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Bicycle Parking" />
             <space />
             <key key="amenity" value="bicycle_parking" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
             <text key="capacity" text="Capacity" />
             <combo key="bicycle_parking" text="Type" values="anchors,building,ground_slots,informal,lockers,shed,stands,wall_loops" />
-            <check key="covered" text="Covered" default="off" />
-            <check key="supervised" text="Supervised" default="off" />
+            <check key="covered" text="Covered" />
+            <check key="supervised" text="Supervised" />
         </item>
         <item name="Bike Dealer" icon="presets/bike.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
@@ -2771,8 +2557,7 @@ Note that for a match, at least one positive and no negative is required.
             <space />
             <key key="type" value="route" />
             <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" values_searchable="true" />
-            <text key="name" text="Name" />
-            <text key="ref" text="Reference" />
+            <reference ref="name_ref" />
             <optional>
                 <text key="from" text="From (initial stop)" />
                 <text key="to" text="To (terminal stop)" />
@@ -2798,8 +2583,7 @@ Note that for a match, at least one positive and no negative is required.
             <space />
             <key key="type" value="route_master" />
             <combo key="route_master" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" />
-            <text key="name" text="Name" />
-            <text key="ref" text="Reference" />
+            <reference ref="name_ref" />
             <optional>
                 <text key="operator" text="Operator" />
                 <text key="network" text="Network" />
@@ -2913,8 +2697,8 @@ Note that for a match, at least one positive and no negative is required.
             <key key="railway" value="subway_entrance" />
             <optional>
                 <text key="name" text="Name" />
-                <check key="wheelchair" text="Wheelchair" default="off" />
-                <check key="bicycle" text="Bicycle" default="off" />
+                <check key="wheelchair" text="Wheelchair" />
+                <check key="bicycle" text="Bicycle" />
             </optional>
         </item>
         <item name="Ticket Machine" icon="presets/vending_machine.png" type="node">
@@ -2927,15 +2711,14 @@ Note that for a match, at least one positive and no negative is required.
             <space />
             <key key="amenity" value="vending_machine" />
             <key key="vending" value="public_transport_tickets" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
             <text key="ref" text="Reference Number" />
-            <check key="payment:coins" text="Coins" default="off" />
-            <check key="payment:notes" text="Notes" default="off" />
-            <check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" />
-            <check key="payment:debit_cards" text="Debit cards" default="off" />
-            <check key="payment:credit_cards" text="Credit cards" default="off" />
-            <check key="payment:account_cards" text="Account or loyalty cards" default="off" />
+            <check key="payment:coins" text="Coins" />
+            <check key="payment:notes" text="Notes" />
+            <check key="payment:electronic_purses" text="Electronic purses and Charge cards" />
+            <check key="payment:debit_cards" text="Debit cards" />
+            <check key="payment:credit_cards" text="Credit cards" />
+            <check key="payment:account_cards" text="Account or loyalty cards" />
         </item>
     </group>
     <group name="Public Transport (legacy)" icon="presets/bus.png">
@@ -2984,7 +2767,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="railway" value="platform" />
             <text key="ref" text="Reference (track number)" />
             <text key="width" text="Width (meters)" />
-            <check key="area" text="Area" default="off" />
+            <check key="area" text="Area" />
         </item>
         <separator/>
         <item name="Bus Station" icon="presets/bus.png" type="node,closedway">
@@ -3023,7 +2806,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="highway" value="platform" />
             <text key="ref" text="Reference (track number)" />
             <text key="width" text="Width (meters)" />
-            <check key="area" text="Area" default="off" />
+            <check key="area" text="Area" />
         </item>
     </group> <!-- Public Transport -->
     <item name="Taxi" icon="presets/taxi.png" type="node,closedway">
@@ -3154,19 +2937,12 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Hotel" />
             <space />
             <key key="tourism" value="hotel" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
             <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <reference ref="internet_smoking_wheelchair" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
         <item name="Motel" icon="styles/standard/accommodation/motel.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel"
@@ -3176,19 +2952,12 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Motel" />
             <space />
             <key key="tourism" value="motel" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
             <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <reference ref="internet_smoking_wheelchair" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
         <item name="Guest House" icon="styles/standard/accommodation/guest_house.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=guest_house"
@@ -3198,19 +2967,12 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Guest House" />
             <space />
             <key key="tourism" value="guest_house" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
             <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <reference ref="internet_smoking_wheelchair" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
         <item name="Chalet" icon="styles/standard/accommodation/chalet.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet"
@@ -3221,19 +2983,12 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Chalet" />
             <space />
             <key key="tourism" value="chalet" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
             <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <reference ref="internet_smoking_wheelchair" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
         <item name="Hostel" icon="presets/hostel.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel"
@@ -3245,19 +3000,12 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Hostel" />
             <space />
             <key key="tourism" value="hostel" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
             <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <reference ref="internet_smoking_wheelchair" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
         <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=alpine_hut"
@@ -3269,19 +3017,12 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Alpine Hut" />
             <space />
             <key key="tourism" value="alpine_hut" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
             <text key="ele" text="Elevation" />
             <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <reference ref="internet_smoking_wheelchair" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
         <separator/>
         <item name="Caravan Site" icon="presets/caravan2.png" type="node,closedway">
@@ -3292,24 +3033,17 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Caravan Site" />
             <space />
             <key key="tourism" value="caravan_site" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
             <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <reference ref="internet_smoking_wheelchair" />
             <space />
             <text key="capacity" text="Number of places" />
             <combo key="fee" text="Requires a fee" values="yes,no,interval" />
-            <check key="power_supply" text="Power supply" default="off" />
-            <check key="tents" text="Tents allowed" default="off" />
+            <check key="power_supply" text="Power supply" />
+            <check key="tents" text="Tents allowed" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
         <item name="Camping Site" icon="presets/tent.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site"
@@ -3323,19 +3057,12 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Camping Site" />
             <space />
             <key key="tourism" value="camp_site" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
             <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <reference ref="internet_smoking_wheelchair" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
     </group> <!-- Accomodation -->
     <group name="Food+Drinks" icon="presets/restaurant.png">
@@ -3350,22 +3077,15 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Restaurant" />
             <space />
             <key key="amenity" value="restaurant" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
             <multiselect key="cuisine" text="Cuisine" values="italian;chinese;pizza;burger;greek;german;indian;regional;kebab;turkish;asian;thai;mexican;japanese;french;sandwich;sushi" values_searchable="true" />
-            <check key="microbrewery" text="Microbrewery" default="off" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <check key="microbrewery" text="Microbrewery" />
+            <reference ref="oh" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
             <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <reference ref="internet_smoking_wheelchair" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
         <item name="Fast Food" icon="presets/fastfood.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food"
@@ -3376,20 +3096,13 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Fast Food Restaurant" />
             <space />
             <key key="amenity" value="fast_food" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
             <combo key="cuisine" text="Cuisine" values="italian,chinese,pizza,burger,greek,german,indian,regional,kebab,turkish,asian,thai,mexican,japanese,french,sandwich,sushi,fish_and_chips,chicken" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="oh" />
             <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <reference ref="internet_smoking_wheelchair" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
         <item name="Food Court" icon="presets/fastfood.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court"
@@ -3399,19 +3112,11 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Food Court" />
             <space />
             <key key="amenity" value="food_court" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
             <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <reference ref="internet_smoking_wheelchair" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
         <item name="Cafe" icon="presets/cafe.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe"
@@ -3426,20 +3131,13 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Cafe" />
             <space />
             <key key="amenity" value="cafe" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
             <combo key="cuisine" text="Cuisine" values="ice_cream" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="oh" />
             <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <reference ref="internet_smoking_wheelchair" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
         <item name="Pub" icon="presets/pub.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub"
@@ -3450,20 +3148,13 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Pub" />
             <space />
             <key key="amenity" value="pub" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <check key="microbrewery" text="Microbrewery" default="off" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator" />
+            <check key="microbrewery" text="Microbrewery" />
+            <reference ref="oh" />
             <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <reference ref="internet_smoking_wheelchair" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
         <item name="Biergarten" icon="presets/biergarten.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=biergarten"
@@ -3474,20 +3165,13 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Biergarten" />
             <space />
             <key key="amenity" value="biergarten" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <check key="microbrewery" text="Microbrewery" default="off" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator" />
+            <check key="microbrewery" text="Microbrewery" />
+            <reference ref="oh" />
             <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <reference ref="internet_smoking_wheelchair" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
         <item name="Bar" icon="presets/bar.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar"
@@ -3501,19 +3185,11 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Bar" />
             <space />
             <key key="amenity" value="bar" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
             <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <reference ref="internet_smoking_wheelchair" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
         <item name="Nightclub" icon="presets/bar.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub"
@@ -3528,17 +3204,12 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Nightclub" />
             <space />
             <key key="amenity" value="nightclub" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
             <space />
             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
         <item name="Stripclub" icon="styles/standard/leisure/stripclub.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=stripclub"
@@ -3549,19 +3220,11 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Stripclub" />
             <space />
             <key key="amenity" value="stripclub" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
             <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <reference ref="internet_smoking_wheelchair" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
     </group> <!-- Food+Drinks -->
     <group name="Tourism" icon="presets/sightseeing.png">
@@ -3569,8 +3232,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Attraction" />
             <space />
             <key key="tourism" value="attraction" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Viewpoint" icon="presets/viewpoint.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint"
@@ -3584,7 +3246,7 @@ Note that for a match, at least one positive and no negative is required.
             <space />
             <key key="tourism" value="viewpoint" />
             <text key="name" text="Name" />
-<!--<check key="man_made" value="tower" text="Look-Out Tower" default="off" />-->
+<!--<check key="man_made" value="tower" text="Look-Out Tower" />-->
         </item>
         <separator/>
         <item name="Information Office" icon="presets/informationoffice.png" type="node,closedway">
@@ -3598,8 +3260,7 @@ Note that for a match, at least one positive and no negative is required.
             <space />
             <key key="tourism" value="information" />
             <key key="information" value="office" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
         </item>
@@ -3614,11 +3275,11 @@ Note that for a match, at least one positive and no negative is required.
             <combo key="map_size" text="Shown Area" values="site,city,region" />
             <text key="description" text="Closer Description" />
             <optional text="Routes shown for:">
-                <check key="hiking" text="Hiking" default="off" />
-                <check key="bicycle" text="Cycling" default="off" />
-                <check key="mtb" text="Mountainbiking" default="off" />
-                <check key="ski" text="Skiing" default="off" />
-                <check key="horse" text="Riding" default="off" />
+                <check key="hiking" text="Hiking" />
+                <check key="bicycle" text="Cycling" />
+                <check key="mtb" text="Mountainbiking" />
+                <check key="ski" text="Skiing" />
+                <check key="horse" text="Riding" />
                 <space />
                 <label text="... other transportation modes possible" />
             </optional>
@@ -3647,11 +3308,11 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
             <text key="ele" text="Elevation" />
             <optional text="Routes shown for:">
-                <check key="hiking" text="Hiking" default="off" />
-                <check key="bicycle" text="Cycling" default="off" />
-                <check key="mtb" text="Mountainbiking" default="off" />
-                <check key="ski" text="Skiing" default="off" />
-                <check key="horse" text="Riding" default="off" />
+                <check key="hiking" text="Hiking" />
+                <check key="bicycle" text="Cycling" />
+                <check key="mtb" text="Mountainbiking" />
+                <check key="ski" text="Skiing" />
+                <check key="horse" text="Riding" />
                 <space />
                 <label text="... other transportation modes possible" />
             </optional>
@@ -3710,9 +3371,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Cinema" />
             <space />
             <key key="amenity" value="cinema" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />            
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
         </item>
         <item name="Zoo" icon="presets/zoo.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
@@ -3722,14 +3381,10 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Zoo" />
             <space />
             <key key="tourism" value="zoo" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
             <text key="wikipedia" text="Wikipedia" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
         <item name="Dog Park" icon="presets/dogpark.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=dog_park"
@@ -3745,11 +3400,11 @@ Note that for a match, at least one positive and no negative is required.
             <space />
             <key key="leisure" value="dog_park" />
             <text key="name" text="Name" />
-            <check key="area" text="Area" default="off" />
-            <combo key="barrier" text="Barrier" values="fence,wall" />  
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
-            <check key="lit" text="Lit" default="off" />
-        </item>  
+            <check key="area" text="Area" />
+            <combo key="barrier" text="Barrier" values="fence,wall" />
+            <reference ref="oh" />
+            <check key="lit" text="Lit" />
+        </item>
         <item name="Theme Park" icon="presets/theme_park.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=theme_park"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=theme_park"
@@ -3758,14 +3413,9 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Theme Park" />
             <space />
             <key key="tourism" value="theme_park" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />            
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
         <item name="Water Park" icon="presets/swimming.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=water_park"
@@ -3778,14 +3428,9 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Water Park" />
             <space />
             <key key="leisure" value="water_park" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />            
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
         <item name="Sauna" de.name="Sauna" icon="presets/sauna.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=sauna"
@@ -3795,30 +3440,22 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Sauna" />
             <space />
             <key key="leisure" value="sauna" />
-            <text key="name" text="Name" />            
-            <text key="operator" text="Operator" />            
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
-            <combo key="access" text="Access" values="yes,permissive,private,unknown" />                                           
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+            <reference ref="oh" />
+            <combo key="access" text="Access" values="yes,permissive,private,unknown" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
         <item name="Horse riding" icon="presets/equestrian.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=horse_riding" />
             <label text="Edit Horse riding" />
             <space />
             <key key="leisure" value="horse_riding" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
             <text key="fee" text="Fee" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <reference ref="contact" />
         </item>
         <item name="Brothel" de.name="Bordell" icon="styles/standard/leisure/stripclub.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=brothel"
@@ -3831,18 +3468,13 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Brothel" />
             <space />
             <key key="amenity" value="brothel" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
             <space />
             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
             <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
-        </item> 
+            <reference ref="contact" />
+        </item>
         <separator/>
         <item name="Playground" icon="styles/standard/leisure/playground.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground"
@@ -3864,7 +3496,7 @@ Note that for a match, at least one positive and no negative is required.
             <space />
             <key key="tourism" value="picnic_site" />
             <text key="name" text="Name" />
-            <check key="fireplace" text="Fireplace" default="off" />
+            <check key="fireplace" text="Fireplace" />
         </item>
         <item name="Public Grill" icon="presets/bbq.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bbq"
@@ -3873,11 +3505,11 @@ Note that for a match, at least one positive and no negative is required.
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bbq"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bbq" />
             <label text="Edit Public Grill" />
-            <space />            
+            <space />
             <key key="amenity" value="bbq" />
             <text key="name" text="Name" />
-            <combo key="covered" text="Covered" values="yes,no" />                               
-            <combo key="fuel" text="Fuel" text_context="grill" values="charcoal,electric,wood" />                               
+            <combo key="covered" text="Covered" values="yes,no" />
+            <combo key="fuel" text="Fuel" text_context="grill" values="charcoal,electric,wood" />
         </item>
         <item name="Fishing" icon="presets/fishing.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=fishing"
@@ -3904,9 +3536,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Museum" />
             <space />
             <key key="tourism" value="museum" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
             <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="Theatre" icon="presets/theater.png" type="node,closedway,relation">
@@ -3918,8 +3548,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Theatre" />
             <space />
             <key key="amenity" value="theatre" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
         </item>
         <item name="Library" icon="styles/standard/shop/rental/library.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
@@ -3933,9 +3562,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Library" />
             <space />
             <key key="amenity" value="library" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
         </item>
         <item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre"
@@ -3967,13 +3594,12 @@ Note that for a match, at least one positive and no negative is required.
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=studio"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=studio" />
             <label text="Edit Studio" />
-            <space />            
+            <space />
             <key key="amenity" value="studio" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />            
+            <reference ref="name_operator" />
             <combo key="type" text="Type" values="audio,video" />
             <text key="phone" text="Phone Number" />
-            <text key="website" text="Website" />                          
+            <text key="website" text="Website" />
         </item>
     </group> <!-- Culture -->
     <group name="Place of Worship" icon="styles/standard/religion.png">
@@ -3999,7 +3625,7 @@ Note that for a match, at least one positive and no negative is required.
             <combo key="building" text="Building type" values="basilica,cathedral,chapel,church,temple" values_searchable="true" />
             <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,greek_catholic,greek_orthodox,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,orthodox,pentecostal,presbyterian,protestant,quaker,roman_catholic,russian_orthodox,seventh_day_adventist" values_searchable="true" />
             <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="oh" />
         </item>
         <item name="Mosque" icon="styles/standard/religion/muslim.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
@@ -4023,7 +3649,7 @@ Note that for a match, at least one positive and no negative is required.
             <combo key="building" text="Building type" values="mosque" values_searchable="true" />
             <combo key="denomination" text="Denomination" values="ibadi,shia,sunni" values_searchable="true" />
             <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="oh" />
         </item>
         <item name="Synagogue" icon="styles/standard/religion/jewish.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
@@ -4047,7 +3673,7 @@ Note that for a match, at least one positive and no negative is required.
             <combo key="building" text="Building type" values="synagogue" values_searchable="true" />
             <combo key="denomination" text="Denomination" values="orthodox,conservative,reform" values_searchable="true" />
             <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="oh" />
         </item>
         <item name="Buddhist Temple" icon="styles/standard/religion/buddhism.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
@@ -4070,7 +3696,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
             <combo key="denomination" text="Denomination" values="theravada,mahayana,vajrayana" values_searchable="true" />
             <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="oh" />
         </item>
         <item name="Hindu Temple" icon="styles/standard/religion/hinduism.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
@@ -4093,7 +3719,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
             <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
             <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="oh" />
         </item>
         <item name="Shinto Shrine" icon="styles/standard/religion/shinto.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
@@ -4115,7 +3741,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="religion" value="shinto" />
             <text key="name" text="Name" />
             <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="oh" />
         </item>
         <item name="Other Place of Worship" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
@@ -4137,7 +3763,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="name" text="Name" />
             <combo key="religion" text="Religion" values="bahai,jain,sikh,spiritualist,taoist,unitarian,zoroastrian" match="keyvalue" values_searchable="true" />
             <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="oh" />
         </item>
     </group> <!-- Place of Worship -->
     <group name="Public Building" icon="presets/townhall.png">
@@ -4172,11 +3798,10 @@ Note that for a match, at least one positive and no negative is required.
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=community_centre"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=community_centre" />
             <label text="Community Centre" />
-            <space />            
+            <space />
             <key key="amenity" value="community_centre" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" /> 
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator" />
+            <reference ref="oh" />
         </item>
         <item name="Embassy" icon="presets/embassy.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy"
@@ -4252,8 +3877,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Post Office" />
             <space />
             <key key="amenity" value="post_office" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
         </item>
     </group> <!-- Public Buildings -->
     <group name="Education" icon="presets/school.png">
@@ -4311,8 +3935,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Driving School" />
             <space />
             <key key="amenity" value="driving_school" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
             <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" />
         </item>
     </group> <!-- Education -->
@@ -4329,8 +3952,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Hospital" />
             <space />
             <key key="amenity" value="hospital" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
         </item>
         <item name="Clinic" icon="styles/standard/health/hospital.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clinic"
@@ -4348,22 +3970,19 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Doctors" />
             <space />
             <key key="amenity" value="doctors" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway">
             <label text="Edit Dentist" />
             <space />
             <key key="amenity" value="dentist" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Nursing Home" type="node,closedway">
             <label text="Edit Nursing Home" />
             <space />
             <key key="amenity" value="nursing_home" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
         </item>
         <item name="Retirement Home" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Key:social_facility"
@@ -4376,8 +3995,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="amenity" value="social_facility" />
             <key key="social_facility" value="group_home" />
             <key key="social_facility:for" value="senior" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
             <text key="capacity" text="Capacity" />
         </item>
         <separator/>
@@ -4395,7 +4013,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="amenity" value="pharmacy" />
             <text key="name" text="Name" />
             <combo key="dispensing" text="Dispensing" values="yes,no" default="no" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="oh" />
         </item>
         <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hearing_aids"
@@ -4404,9 +4022,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Hearing Aids" />
             <space />
             <key key="shop" value="hearing_aids" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
         </item>
         <separator/>
         <item name="Baby Hatch" icon="presets/baby_hatch.png" type="node,closedway">
@@ -4424,7 +4040,7 @@ Note that for a match, at least one positive and no negative is required.
             <space />
             <key key="amenity" value="baby_hatch" />
             <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="oh" />
         </item>
         <separator/>
         <item name="Emergency Access Point" icon="styles/standard/service/emergency_access_point.png" type="node,closedway">
@@ -4457,8 +4073,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Veterinary" />
             <space />
             <key key="amenity" value="veterinary" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
     </group> <!-- Health -->
     <group name="Facilities" icon="presets/telephone.png">
@@ -4512,12 +4127,12 @@ Note that for a match, at least one positive and no negative is required.
             <space />
             <key key="amenity" value="telephone" />
             <text key="operator" text="Operator" />
-            <check key="payment:coins" text="Coins" default="off" />
-            <check key="payment:notes" text="Notes" default="off" />
-            <check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" />
-            <check key="payment:debit_cards" text="Debit cards" default="off" />
-            <check key="payment:credit_cards" text="Credit cards" default="off" />
-            <check key="payment:telephone_cards" text="Telephone cards" default="off" />
+            <check key="payment:coins" text="Coins" />
+            <check key="payment:notes" text="Notes" />
+            <check key="payment:electronic_purses" text="Electronic purses and Charge cards" />
+            <check key="payment:debit_cards" text="Debit cards" />
+            <check key="payment:credit_cards" text="Credit cards" />
+            <check key="payment:telephone_cards" text="Telephone cards" />
         </item>
         <item name="Emergency Phone" icon="presets/telephone.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=phone"
@@ -4527,7 +4142,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="emergency" value="phone" />
         </item>
         <item name="Internet Access" icon="presets/network-wireless.svg" type="node,closedway,relation">
-            <link href="http://wiki.openstreetmap.org/wiki/Key:internet_access" 
+            <link href="http://wiki.openstreetmap.org/wiki/Key:internet_access"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:internet_access"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:internet_access"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:internet_access"
@@ -4547,8 +4162,8 @@ Note that for a match, at least one positive and no negative is required.
             <space />
             <key key="emergency" value="aed" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,limited" />
-            <text  key="operator" text="Operator" /> 
-            <check key="indoor" text="Located inside a building?" default="off" />
+            <text  key="operator" text="Operator" />
+            <check key="indoor" text="Located inside a building?" />
             <!-- lastcheck is in use for aed devices, but not yet well discussed or documented
             <optional>
                 <text key="lastcheck"      text="Last check date (YYYY-MM-DD)" />
@@ -4568,10 +4183,10 @@ Note that for a match, at least one positive and no negative is required.
                 <combo key="display" text="Display" values="analog,digital,sundial,unorthodox" />
                 <combo key="support" text="Support" values="pole,wall_mounted,billboard,ground" values_context="mounting/support" />
                 <combo key="visibility" text="Visibility/readability" values="house,street,area" display_values="house (up to 5m),street (up to 20m),area (more than 20m)" />
-                <check key="date" text="Shows current date" default="off" />
-                <check key="thermometer" text="Shows temperature" default="off" />
-                <check key="barometer" text="Shows barometric pressure" default="off" />
-                <check key="hygrometer" text="Shows humidity" default="off" />
+                <check key="date" text="Shows current date" />
+                <check key="thermometer" text="Shows temperature" />
+                <check key="barometer" text="Shows barometric pressure" />
+                <check key="hygrometer" text="Shows humidity" />
             </optional>
         </item>
         <item name="Recycling" icon="presets/recycling.png" type="node,closedway">
@@ -4588,12 +4203,12 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Recycling Station" />
             <space />
             <key key="amenity" value="recycling" />
-            <check key="recycling:batteries" text="Batteries" default="off" />
-            <check key="recycling:cans" text="Cans" default="off" />
-            <check key="recycling:clothes" text="Clothes" default="off" />
-            <check key="recycling:glass" text="Glass" default="off" />
-            <check key="recycling:paper" text="Paper" default="off" />
-            <check key="recycling:scrap_metal" text="Scrap Metal" default="off" />
+            <check key="recycling:batteries" text="Batteries" />
+            <check key="recycling:cans" text="Cans" />
+            <check key="recycling:clothes" text="Clothes" />
+            <check key="recycling:glass" text="Glass" />
+            <check key="recycling:paper" text="Paper" />
+            <check key="recycling:scrap_metal" text="Scrap Metal" />
             <combo key="recycling_type" text="Type" values="container,centre" />
         </item>
         <item name="Waste Basket" icon="styles/standard/service/recycling/trash-bin.png" type="node">
@@ -4642,7 +4257,7 @@ Note that for a match, at least one positive and no negative is required.
             <space />
             <key key="amenity" value="shelter" />
             <text key="name" text="Name" />
-            <check key="fireplace" text="Fireplace" default="off" />
+            <check key="fireplace" text="Fireplace" />
             <combo key="shelter_type" text="Type of shelter" values="weather_shelter,public_transport,picnic_shelter,wildlife_hide" values_context="shelter" values_searchable="true" />
         </item>
         <item name="Hunting Stand" icon="presets/hunting_stand.png" type="node">
@@ -4666,7 +4281,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Source of Potable Water" />
             <space />
             <key key="amenity" value="drinking_water" />
-            <check key="indoor" text="Indoor" default="off" />
+            <check key="indoor" text="Indoor" />
             <optional>
                 <text key="name" text="Name" />
                 <text key="description" text="Description" />
@@ -4686,8 +4301,7 @@ Note that for a match, at least one positive and no negative is required.
             <combo key="fire_hydrant:type" text="Type" values="underground,pillar,wall,pond" values_context="pipeline" default="pillar" />
             <combo key="fire_hydrant:diameter" text="Diameter (in mm)" values="50,80,100,150,200,250,300,400" />
             <space />
-            <text key="name" text="Name" />
-            <text key="ref" text="Reference" />
+            <reference ref="name_ref" />
             <text key="operator" text="Operator" />
             <space />
             <combo key="fire_hydrant:position" text="Hydrant Position" values="lane,parking_lot,sidewalk,green" values_context="hydrant position" />
@@ -4738,15 +4352,13 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Golf Course" />
             <space />
             <key key="leisure" value="golf_course" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Miniature Golf" icon="presets/golf.png" type="node,closedway">
             <label text="Edit Miniature Golf" />
             <space />
             <key key="leisure" value="miniature_golf" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
     </group> <!-- Sport facilities -->
     <group name="Sport" icon="presets/rowing.png">
@@ -4908,40 +4520,35 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Soccer" />
             <space />
             <key key="sport" value="soccer" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
+            <reference ref="name_leisure_pitch" />
         </item>
         <item name="Australian Football" icon="presets/soccer.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=australian_football" />
             <label text="Edit Australian Football" />
             <space />
             <key key="sport" value="australian_football" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
+            <reference ref="name_leisure_pitch" />
         </item>
         <item name="American Football" icon="presets/football.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=american_football" />
             <label text="Edit American Football" />
             <space />
             <key key="sport" value="american_football" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
+            <reference ref="name_leisure_pitch" />
         </item>
         <item name="Canadian Football" icon="presets/football.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canadian_football" />
             <label text="Edit Canadian Football" />
             <space />
             <key key="sport" value="canadian_football" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
+            <reference ref="name_leisure_pitch" />
         </item>
         <item name="Gaelic Games" icon="presets/soccer.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_games" />
             <label text="Edit Gaelic Games" />
             <space />
             <key key="sport" value="gaelic_games" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
+            <reference ref="name_leisure_pitch" />
             <optional>
                 <check key="gaelic_games:hurling" text="Hurling" />
                 <check key="gaelic_games:football" text="Football" />
@@ -4955,8 +4562,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Rugby League" />
             <space />
             <key key="sport" value="rugby_league" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
+            <reference ref="name_leisure_pitch" />
         </item>
         <item name="Rugby Union" icon="presets/football.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_union"
@@ -4964,43 +4570,38 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Rugby Union" />
             <space />
             <key key="sport" value="rugby_union" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
+            <reference ref="name_leisure_pitch" />
         </item>
         <item name="Baseball" icon="presets/baseball.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=baseball" />
             <label text="Edit Baseball" />
             <space />
             <key key="sport" value="baseball" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
+            <reference ref="name_leisure_pitch" />
         </item>
         <item name="Basketball" icon="presets/basketball.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=basketball" />
             <label text="Edit Basketball" />
             <space />
             <key key="sport" value="basketball" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
+            <reference ref="name_leisure_pitch" />
         </item>
         <item name="Volleyball" icon="styles/standard/sport/volleyball.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=volleyball" />
             <label text="Edit Volleyball" />
-            <space />            
+            <space />
             <key key="sport" value="volleyball" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" /> 
+            <reference ref="name_operator" />
             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
-        </item> 
+        </item>
         <item name="Beachvolleyball" icon="presets/beachvolleyball.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=beachvolleyball" />
             <label text="Edit Beachvolleyball" />
-            <space />            
+            <space />
             <key key="sport" value="beachvolleyball" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" /> 
+            <reference ref="name_operator" />
             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
-        </item> 
+        </item>
         <item name="Golf" icon="presets/golf.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=golf"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=golf"
@@ -5017,24 +4618,21 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Boule" />
             <space />
             <key key="sport" value="boules" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
+            <reference ref="name_leisure_pitch" />
         </item>
         <item name="Bowls" icon="presets/boule.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=bowls" />
             <label text="Edit Bowls" />
             <space />
             <key key="sport" value="bowls" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
+            <reference ref="name_leisure_pitch" />
         </item>
         <item name="Cricket" icon="presets/cricket.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket" />
             <label text="Edit Cricket" />
             <space />
             <key key="sport" value="cricket" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
+            <reference ref="name_leisure_pitch" />
         </item>
         <item name="Cricket Nets" icon="presets/cricket.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket_nets" />
@@ -5049,8 +4647,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Croquet" />
             <space />
             <key key="sport" value="croquet" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
+            <reference ref="name_leisure_pitch" />
         </item>
         <item name="Hockey" icon="presets/Hockey.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=hockey" />
@@ -5066,8 +4663,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Pelota" />
             <space />
             <key key="sport" value="pelota" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
+            <reference ref="name_leisure_pitch" />
         </item>
         <item name="Racquet" icon="presets/racquetball.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=racquet"
@@ -5091,8 +4687,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Tennis" />
             <space />
             <key key="sport" value="tennis" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
+            <reference ref="name_leisure_pitch" />
         </item>
     </group> <!-- Sport (Ball) -->
     <group name="Motorsport" icon="presets/motorbike.png">
@@ -5215,11 +4810,10 @@ Note that for a match, at least one positive and no negative is required.
         <item name="Chimney" icon="presets/chimney.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Chimney" />
             <label text="Edit Chimney" />
-            <space />            
+            <space />
             <key key="man_made" value="chimney" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />            
-            <text key="height" text="Height (meters)" />            
+            <reference ref="name_operator" />
+            <text key="height" text="Height (meters)" />
         </item>
         <item name="Windmill" icon="presets/windmill.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill"
@@ -5272,8 +4866,8 @@ Note that for a match, at least one positive and no negative is required.
             <text key="depth" text="Depth in meters" />
             <text key="operator" text="Operator" />
             <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
-            <combo key="headframe" text="Visible Headframe" values="yes,no" />  
-            <check key="disused" text="Disused" default="off" />                                                             
+            <combo key="headframe" text="Visible Headframe" values="yes,no" />
+            <check key="disused" text="Disused" />
         </item>
         <item name="Adit" icon="presets/adit.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=adit"
@@ -5289,7 +4883,7 @@ Note that for a match, at least one positive and no negative is required.
             <text key="length" text="Length in meters" />
             <text key="operator" text="Operator" />
             <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
-            <check key="disused" text="Disused" default="off" />                                                             
+            <check key="disused" text="Disused" />
         </item>
         <separator/>
         <item name="Water Tower" icon="presets/water_tower.png" type="node,closedway">
@@ -5305,11 +4899,10 @@ Note that for a match, at least one positive and no negative is required.
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=water_works"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=water_works" />
             <label text="Edit Water Works" />
-            <space />            
+            <space />
             <key key="man_made" value="water_works" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />            
-        </item>              
+            <reference ref="name_operator" />
+        </item>
         <item name="Wastewater Plant" icon="presets/wastewater_plant.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
@@ -5330,10 +4923,10 @@ Note that for a match, at least one positive and no negative is required.
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=watermill"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=watermill" />
             <label text="Edit Watermill" />
-            <space />            
+            <space />
             <key key="man_made" value="watermill" />
             <text key="name" text="Name" />
-        </item>       
+        </item>
         <item name="Fountain" icon="presets/spring.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fountain"
@@ -5386,19 +4979,18 @@ Note that for a match, at least one positive and no negative is required.
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=street_lamp"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=street_lamp" />
             <label text="Edit Street Lamp" />
-            <space />            
+            <space />
             <key key="highway" value="street_lamp" />
-            <combo key="opening_hours" text="Operation times" values="Mo-Fr 22:00-05:00" />                                                                                        
-        </item> 
+            <combo key="opening_hours" text="Operation times" values="Mo-Fr 22:00-05:00" />
+        </item>
         <item name="Monitoring Station" icon="presets/monitoring_station.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=monitoring_station" 
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=monitoring_station"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=monitoring_station"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=monitoring_station" />
             <label text="Edit Monitoring Station" />
-            <space />            
+            <space />
             <key key="man_made" value="monitoring_station" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />             
+            <reference ref="name_operator" />
             <label text="Monitoring:" />
             <checkgroup columns="3">
                 <check key="monitoring:weather" text="Weather" />
@@ -5470,8 +5062,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Power Plant" />
             <space />
             <key key="power" value="plant" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
             <text key="ref" text="Reference" />
             <text key="start_date" text="Start date" />
             <optional>
@@ -5499,8 +5090,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Power Generator" />
             <space />
             <key key="power" value="generator" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
             <text key="ref" text="Reference" />
             <text key="start_date" text="Start date" />
             <combo key="generator:source" text="Source" values_searchable="true">
@@ -5677,8 +5267,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Ruins" />
             <space />
             <key key="historic" value="ruins" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Archaeological Site" icon="styles/standard/sightseeing/archaeological.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
@@ -5689,8 +5278,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Archaeological Site" />
             <space />
             <key key="historic" value="archaeological_site" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield"
@@ -5763,8 +5351,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Supermarket" />
             <space />
             <key key="shop" value="supermarket" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Convenience Store" icon="presets/convenience.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience"
@@ -5775,8 +5362,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Convenience Store" />
             <space />
             <key key="shop" value="convenience" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Kiosk" icon="presets/kiosk.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk"
@@ -5788,8 +5374,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Kiosk" />
             <space />
             <key key="shop" value="kiosk" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <separator/>
         <item name="Bakery" icon="presets/baker.png" type="node,closedway">
@@ -5805,8 +5390,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Bakery" />
             <space />
             <key key="shop" value="bakery" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Butcher" icon="presets/cow.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher"
@@ -5819,8 +5403,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Butcher" />
             <space />
             <key key="shop" value="butcher" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Seafood" icon="presets/seafood.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=seafood"
@@ -5828,11 +5411,9 @@ Note that for a match, at least one positive and no negative is required.
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=seafood"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=seafood" />
             <label text="Edit Seafood Shop" />
-            <space />            
+            <space />
             <key key="shop" value="seafood" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
         </item>
         <item name="Deli (Fine Food)" icon="presets/deli.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=deli"
@@ -5844,10 +5425,8 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Deli (Fine Food)" />
             <space />
             <key key="shop" value="deli" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
-        </item>                     
+            <reference ref="name_operator_oh" />
+        </item>
         <item name="Confectionery" icon="presets/confectionery.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=confectionery"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=confectionery"
@@ -5859,8 +5438,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Confectionery" />
             <space />
             <key key="shop" value="confectionery" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <separator/>
         <item name="Marketplace" icon="styles/standard/place/marketplace.png" type="node,way,closedway">
@@ -5873,11 +5451,9 @@ Note that for a match, at least one positive and no negative is required.
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=marketplace"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=marketplace" />
             <label text="Edit Marketplace" />
-            <space />            
+            <space />
             <key key="amenity" value="marketplace" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
             <text key="website" text="Website" />
             <combo key="organic" text="Organic" values="only,yes,no" />
         </item>
@@ -5888,10 +5464,9 @@ Note that for a match, at least one positive and no negative is required.
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=greengrocer"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=greengrocer" />
             <label text="Edit Greengrocer" />
-            <space />            
+            <space />
             <key key="shop" value="greengrocer" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
             <text key="website" text="Website" />
             <combo key="organic" text="Organic" values="only,yes,no" />
         </item>
@@ -5903,9 +5478,8 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Farm Stand" />
             <space />
             <key key="shop" value="farm" />
-            <text key="name" text="Name" />
+            <reference ref="name_oh" />
             <text key="description" text="Description" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
             <text key="phone" text="Phone Number" match="key" />
             <text key="website" text="Website" />
             <combo key="organic" text="Organic" values="only,yes,no" />
@@ -5935,8 +5509,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Alcohol Shop" />
             <space />
             <key key="shop" value="alcohol" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Beverages" icon="styles/standard/shop/beverages.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beverages"
@@ -5946,8 +5519,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Beverages Shop" />
             <space />
             <key key="shop" value="beverages" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
     </group> <!-- Food -->
     <group name="Clothes" icon="styles/standard/shop/clothes.png">
@@ -5961,8 +5533,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Clothes Shop" />
             <space />
             <key key="shop" value="clothes" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
             <combo key="organic" text="Organic" values="only,yes,no" />
         </item>
@@ -5975,9 +5546,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Boutique" />
             <space />
             <key key="shop" value="boutique" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
         </item>
         <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=shoes"
@@ -5987,8 +5556,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Shoe Shop" />
             <space />
             <key key="shop" value="shoes" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
             <combo key="organic" text="Organic" values="only,yes,no" />
         </item>
@@ -6000,8 +5568,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Outdoor Shop" />
             <space />
             <key key="shop" value="outdoor" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Sports" icon="presets/rowing.png" type="node,closedway">
              <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=sports"
@@ -6010,8 +5577,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Sports Shop" />
             <space />
             <key key="shop" value="sports" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <separator/>
         <item name="Dry Cleaning" icon="presets/laundry.png" type="node,closedway">
@@ -6023,8 +5589,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Dry Cleaning" />
             <space />
             <key key="shop" value="dry_cleaning" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Laundry" icon="presets/laundry.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=laundry"
@@ -6034,15 +5599,13 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Laundry" />
             <space />
             <key key="shop" value="laundry" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Tailor" icon="styles/standard/shop/tailor.png" type="node,closedway">
             <label text="Edit Tailor" />
             <space />
             <key key="shop" value="tailor" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Fabric" icon="presets/fabric.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=fabric"
@@ -6051,9 +5614,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Fabric Shop" />
             <space />
             <key key="shop" value="fabric" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
         </item>
     </group> <!-- Clothes -->
     <group name="Electronic" icon="styles/standard/shop/electronics.png">
@@ -6065,8 +5626,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Computer Shop" />
             <space />
             <key key="shop" value="computer" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=electronics"
@@ -6076,8 +5636,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Electronics Shop" />
             <space />
             <key key="shop" value="electronics" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Mobile Phone" icon="presets/mobile_phone.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mobile_phone"
@@ -6086,9 +5645,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Mobile Phone Shop" />
             <space />
             <key key="shop" value="mobile_phone" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
         </item>
         <item name="Vacuum Cleaner" icon="presets/vacuum_cleaner.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=vacuum_cleaner"
@@ -6097,9 +5654,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Vacuum Cleaner Shop" />
             <space />
             <key key="shop" value="vacuum_cleaner" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
         </item>
         <item name="Hifi" icon="styles/standard/shop/hifi.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hifi"
@@ -6109,8 +5664,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Hifi Shop" />
             <space />
             <key key="shop" value="hifi" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Video" icon="styles/standard/shop/video.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=video"
@@ -6120,8 +5674,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Video Shop" />
             <space />
             <key key="shop" value="video" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
     </group> <!-- Electronic -->
     <group name="Cash" icon="presets/dollar.png">
@@ -6139,10 +5692,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Bank" />
             <space />
             <key key="amenity" value="bank" />
-            <text key="name" text="Name" />
-            <text key="brand" text="Brand" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_brand_operator_oh" />
             <check key="atm" text="Automated Teller Machine" default="on" />
         </item>
         <item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway">
@@ -6155,8 +5705,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Money Exchange" />
             <space />
             <key key="amenity" value="bureau_de_change" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Automated Teller Machine" icon="styles/standard/money/atm.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm"
@@ -6175,7 +5724,7 @@ Note that for a match, at least one positive and no negative is required.
             <key key="amenity" value="atm" />
             <text key="brand" text="Brand" />
             <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="oh" />
         </item>
         <item name="Pawnbroker" icon="presets/pawnbroker.svg" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=pawnbroker"
@@ -6184,8 +5733,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Pawnbroker" />
             <space />
             <key key="shop" value="pawnbroker" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
     </group> <!-- Cash -->
     <group name="Other" icon="styles/standard/shop/mall.png">
@@ -6198,9 +5746,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Department Store" />
             <space />
             <key key="shop" value="department_store" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
         </item>
         <item name="Mall" icon="styles/standard/shop/mall.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mall"
@@ -6210,9 +5756,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Mall" />
             <space />
             <key key="shop" value="mall" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
         </item>
         <separator/>
         <item name="Chemist" icon="styles/standard/shop/chemist.png" type="node,closedway">
@@ -6224,8 +5768,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Chemist" />
             <space />
             <key key="shop" value="chemist" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Hairdresser" icon="styles/standard/shop/hairdresser.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hairdresser"
@@ -6237,8 +5780,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Hairdresser" />
             <space />
             <key key="shop" value="hairdresser" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=optician"
@@ -6247,8 +5789,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Optician" />
             <space />
             <key key="shop" value="optician" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Jewelry" icon="styles/standard/shop/jewelry.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=jewelry"
@@ -6257,9 +5798,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Jewelry" />
             <space />
             <key key="shop" value="jewelry" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
         </item>
         <item name="Gift" icon="http://openclipart.org/people/secretlondon/secretlondon_chocolate_present.svg" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=gift"
@@ -6271,9 +5810,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Gift Shop" />
             <space />
             <key key="shop" value="gift" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
             <optional>
                 <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
                 <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
@@ -6286,9 +5823,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Erotic Shop" />
             <space />
             <key key="shop" value="erotic" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
         </item>
         <separator/>
         <item name="Florist" icon="styles/standard/shop/florist.png" type="node,closedway">
@@ -6301,8 +5836,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Florist" />
             <space />
             <key key="shop" value="florist" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Garden Centre" icon="styles/standard/shop/garden_centre.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre"
@@ -6315,9 +5849,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Garden Centre" />
             <space />
             <key key="shop" value="garden_centre" />
-            <text key="name" text="Name" />
-            <text key="brand" text="Brand" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_brand_oh" />
         </item>
         <separator/>
         <item name="Do-it-yourself-store" icon="presets/diy_store.png" type="node,closedway">
@@ -6330,9 +5862,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Do-it-yourself-store" />
             <space />
             <key key="shop" value="doityourself" />
-            <text key="name" text="Name" />
-            <text key="brand" text="Brand" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_brand_oh" />
         </item>
         <item name="Hardware" icon="presets/hardware.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware"
@@ -6342,8 +5872,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Hardware Store" />
             <space />
             <key key="shop" value="hardware" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Paint" icon="presets/paint.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=paint"
@@ -6353,19 +5882,14 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Paint Shop" />
             <space />
             <key key="shop" value="paint" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
         </item>
         <separator/>
         <item name="Furniture" icon="styles/standard/shop/furniture.png" type="node,closedway">
             <label text="Edit Furniture Shop" />
             <space />
             <key key="shop" value="furniture" />
-            <text key="name" text="Name" />
-            <text key="brand" text="Brand" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_brand_operator_oh" />
         </item>
         <item name="Kitchen" icon="presets/kitchen.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kitchen"
@@ -6376,10 +5900,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Kitchen Store" />
             <space />
             <key key="shop" value="kitchen" />
-            <text key="name" text="Name" />
-            <text key="brand" text="Brand" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_brand_operator_oh" />
         </item>
         <item name="Curtain" icon="presets/curtain.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=curtain"
@@ -6388,9 +5909,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Curtain Shop" />
             <space />
             <key key="shop" value="curtain" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
         </item>
         <item name="Frame" icon="presets/frame.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=frame"
@@ -6400,9 +5919,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Frames Shop" />
             <space />
             <key key="shop" value="frame" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
         </item>
         <separator/>
         <item name="Stationery" icon="presets/stationery.png" type="node,closedway">
@@ -6413,8 +5930,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Stationery Shop" />
             <space />
             <key key="shop" value="stationery" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Copyshop" icon="presets/copyshop.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=copyshop"
@@ -6424,9 +5940,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Copyshop" />
             <space />
             <key key="shop" value="copyshop" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
         </item>
         <item name="Book Store" icon="presets/book.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=book"
@@ -6437,9 +5951,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Book Store" />
             <space />
             <key key="shop" value="books" />
-            <text key="name" text="Name" />
-            <text key="brand" text="Brand" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_brand_oh" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
         </item>
         <item name="Newsagent's shop" icon="presets/kiosk.png" type="node,closedway">
@@ -6451,8 +5963,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Newsagent's shop" />
             <space />
             <key key="shop" value="newsagent" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <separator/>
         <item name="Travel Agency" icon="presets/travel.png" type="node,closedway">
@@ -6461,9 +5972,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Travel Agency" />
             <space />
             <key key="shop" value="travel_agency" />
-            <text key="name" text="Name" />
-            <text key="brand" text="Brand" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_brand_oh" />
         </item>
         <item name="Musical Instrument" icon="presets/musical_instrument.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=musical_instrument"
@@ -6472,19 +5981,16 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Musical Instruments Shop" />
             <space />
             <key key="shop" value="musical_instrument" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
         </item>
         <item name="Toys" icon="styles/standard/shop/toys.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=toy"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=toy"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=toy" />
             <label text="Edit Toy Shop" />
-            <space />            
+            <space />
             <key key="shop" value="toys" />
-            <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_oh" />
         </item>
         <item name="Variety Store" icon="presets/variety_store.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=variety_store"
@@ -6493,9 +5999,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Variety Store" />
             <space />
             <key key="shop" value="variety_store" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <reference ref="name_operator_oh" />
         </item>
     </group> <!-- Other -->
     <item name="Vending machine" icon="presets/vending_machine.png" type="node">
@@ -6504,18 +6008,18 @@ Note that for a match, at least one positive and no negative is required.
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=vending_machine"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=vending_machine" />
         <label text="Edit Vending machine" />
-        <space />            
+        <space />
         <key key="amenity" value="vending_machine" />
         <multiselect key="vending" text="Vending products" values="animal_food;bicycle_tube;cigarettes;condoms;drinks;excrement_bags;food;news_papers;parking_tickets;photos;public_transport_plans;public_transport_tickets;SIM-cards;stamps;sweets;tampons;telephone_vouchers;toys;vouchers" values_searchable="true" />
         <text key="operator" text="Operator" />
         <text key="ref" text="Reference number" />
         <text key="note" text="Note" />
-        <check key="payment:coins" text="Coins" default="off" />
-        <check key="payment:notes" text="Notes" default="off" />
-        <check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" />
-        <check key="payment:debit_cards" text="Debit cards" default="off" />
-        <check key="payment:credit_cards" text="Credit cards" default="off" />
-        <check key="payment:account_cards" text="Account or loyalty cards" default="off" />
+        <check key="payment:coins" text="Coins" />
+        <check key="payment:notes" text="Notes" />
+        <check key="payment:electronic_purses" text="Electronic purses and Charge cards" />
+        <check key="payment:debit_cards" text="Debit cards" />
+        <check key="payment:credit_cards" text="Credit cards" />
+        <check key="payment:account_cards" text="Account or loyalty cards" />
     </item>
   </group> <!-- Shops -->
   <group name="Geography" icon="presets/peak.svg">
@@ -6940,11 +6444,11 @@ Note that for a match, at least one positive and no negative is required.
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=greenhouse_horticulture"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=greenhouse_horticulture" />
             <label text="Edit Greenhouse Horticulture" />
-            <space />            
+            <space />
             <key key="landuse" value="greenhouse_horticulture" />
-            <text key="name" text="Name" /> 
-            <text key="operator" text="Operator" />                                                                
-        </item>        
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+        </item>
         <item name="Allotments" icon="presets/landuse.png" type="node,closedway,relation">
             <label text="Edit Allotments Landuse" />
             <space />
@@ -7083,11 +6587,11 @@ Note that for a match, at least one positive and no negative is required.
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=garages"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=garages" />
             <label text="Edit Garages" />
-            <space />            
+            <space />
             <key key="landuse" value="garages" />
-            <text key="name" text="Name" />                                                    
+            <text key="name" text="Name" />
             <text key="operator" text="Operator" />
-        </item> 
+        </item>
         <item name="Railway land" icon="presets/rail_light.png" type="closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=railway"
@@ -7162,8 +6666,7 @@ Note that for a match, at least one positive and no negative is required.
             <label text="Edit Quarry Landuse" />
             <space />
             <key key="landuse" value="quarry" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
         </item>
     </group> <!-- Landuse -->
   </group>
@@ -7389,8 +6892,7 @@ Note that for a match, at least one positive and no negative is required.
             <space />
             <key key="type" value="route" />
             <combo key="route" text="Route type" values="bicycle,bus,road,ferry,ski,foot,hiking,tram,detour,railway,subway" values_context="route type" values_searchable="true" />
-            <text key="name" text="Name" />
-            <text key="ref" text="Reference" />
+            <reference ref="name_ref" />
             <text key="symbol" text="Symbol description" />
             <text key="description" text="Description" />
             <optional>
@@ -7513,8 +7015,7 @@ Note that for a match, at least one positive and no negative is required.
             <space />
             <key key="type" value="bridge" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-            <text key="name" text="Name" />
-            <text key="ref" text="Reference" />
+            <reference ref="name_ref" />
             <text key="height" text="Height (meters)" />
             <text key="length" text="Length (meters)" />
             <text key="operator" text="Operator" />
@@ -7531,8 +7032,7 @@ Note that for a match, at least one positive and no negative is required.
             <space />
             <key key="type" value="tunnel" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-            <text key="name" text="Name" />
-            <text key="ref" text="Reference" />
+            <reference ref="name_ref" />
             <text key="length" text="Length (meters)" />
             <text key="operator" text="Operator" />
             <roles>
diff --git a/data/tagging-preset.xsd b/data/tagging-preset.xsd
index af5cdf3..755f17f 100644
--- a/data/tagging-preset.xsd
+++ b/data/tagging-preset.xsd
@@ -99,7 +99,7 @@
         <attribute name="ref" type="IDREF" use="required" />
     </complexType>
 
-	<group name="optional_elements">
+    <group name="optional_elements">
 		<choice>
 			<element name="label" type="tns:label" />
 			<element name="space" type="tns:space" />
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java
index c159c60..786f499 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java
@@ -9,9 +9,13 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 
 import javax.swing.JOptionPane;
 
@@ -44,6 +48,20 @@ public final class TaggingPresetReader {
 
         return sources;
     }
+
+    /**
+     * Holds a reference to a chunk of  items/objects.
+     */
+    public static class Chunk {
+        public String id;
+    }
+
+    /**
+     * Holds a reference to an earlier item/object.
+     */
+    public static class Reference {
+        public String ref;
+    }
     
     public static List<TaggingPreset> readAll(Reader in, boolean validate) throws SAXException {
         XmlObjectParser parser = new XmlObjectParser();
@@ -64,12 +82,17 @@ public final class TaggingPresetReader {
         parser.map("key", TaggingPresetItems.Key.class);
         parser.map("list_entry", TaggingPresetItems.PresetListEntry.class);
         parser.map("item_separator", TaggingPresetItems.ItemSeparator.class);
-        
+        parser.mapBoth("chunk", Chunk.class);
+        parser.map("reference", Reference.class);
+
         LinkedList<TaggingPreset> all = new LinkedList<TaggingPreset>();
         TaggingPresetMenu lastmenu = null;
         TaggingPresetItems.Roles lastrole = null;
         final List<TaggingPresetItems.Check> checks = new LinkedList<TaggingPresetItems.Check>();
         List<TaggingPresetItems.PresetListEntry> listEntries = new LinkedList<TaggingPresetItems.PresetListEntry>();
+        final Map<String, List<Object>> byId = new HashMap<String, List<Object>>();
+        String lastId = null;
+        Iterator<Object> lastIdIterator = null;
 
         if (validate) {
             parser.startWithValidation(in, Main.JOSM_WEBSITE+"/tagging-preset-1.0", "resource://data/tagging-preset.xsd");
@@ -77,7 +100,42 @@ public final class TaggingPresetReader {
             parser.start(in);
         }
         while (parser.hasNext()) {
-            Object o = parser.next();
+            final Object o;
+            if (lastIdIterator != null && lastIdIterator.hasNext()) {
+                // obtain elements from lastIdIterator with higher priority
+                o = lastIdIterator.next();
+            } else {
+                o = parser.next();
+            }
+            if (o instanceof Chunk) {
+                if (((Chunk) o).id.equals(lastId)) {
+                    // reset last id on end of object, don't process further
+                    lastId = null;
+                    ((Chunk) o).id = null;
+                    continue;
+                } else if (lastId == null) {
+                    // if preset item contains an id, store a mapping for later usage
+                    lastId = ((Chunk) o).id;
+                    byId.put(lastId, new ArrayList<Object>());
+                    continue;
+                } else {
+                    throw new IllegalStateException("Cannot deal with nested id objects (lastId was expected to be null)");
+                }
+            } else if (lastId != null) {
+                // add object to mapping for later usage
+                byId.get(lastId).add(o);
+                continue;
+            }
+            if (o instanceof Reference) {
+                // if o is a reference, obtain the corresponding objects from the mapping,
+                // and iterate over those before consuming the next element from parser.
+                final String ref = ((Reference) o).ref;
+                if (byId.get(ref) == null) {
+                    throw new SAXException(tr("Reference {0} is being used before it was defined", ref));
+                }
+                lastIdIterator = byId.get(ref).iterator();
+                continue;
+            }
             if (!(o instanceof TaggingPresetItem) && !checks.isEmpty()) {
                 all.getLast().data.addAll(checks);
                 checks.clear();