Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 6557)
+++ /trunk/data/defaultpresets.xml	(revision 6558)
@@ -46,5 +46,5 @@
   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
@@ -60,5 +60,5 @@
   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"
@@ -85,5 +85,5 @@
              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"
@@ -109,5 +109,5 @@
   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")
@@ -121,4 +121,10 @@
   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:
@@ -149,4 +155,116 @@
 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">
@@ -168,16 +286,13 @@
             <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>
@@ -196,8 +311,5 @@
             <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" />
@@ -227,8 +339,5 @@
             <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" />
@@ -256,8 +365,5 @@
             <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" />
@@ -269,5 +375,5 @@
                     <check key="lit" text="Lit" />
                     <check key="toll" text="Toll" />
-                </checkgroup> 
+                </checkgroup>
             </optional>
         </item>
@@ -289,16 +395,9 @@
             <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>
@@ -314,16 +413,9 @@
             <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>
@@ -345,15 +437,6 @@
             <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>
@@ -369,15 +452,6 @@
             <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>
@@ -400,15 +474,6 @@
             <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>
@@ -424,15 +489,6 @@
             <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>
@@ -452,16 +508,7 @@
                 <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>
@@ -483,15 +530,6 @@
             <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>
@@ -512,13 +550,9 @@
                 <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>
@@ -540,12 +574,6 @@
                 <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>
@@ -569,12 +597,8 @@
                 <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>
@@ -595,16 +619,7 @@
             <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>
@@ -623,7 +638,7 @@
             <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>
@@ -641,16 +656,6 @@
             <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>
@@ -667,15 +672,6 @@
             <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)" />
@@ -697,7 +693,7 @@
             <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 />
@@ -747,13 +743,7 @@
             <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>
@@ -816,14 +806,7 @@
             <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" />
@@ -848,14 +831,7 @@
             <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" />
@@ -889,15 +865,8 @@
             <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>
@@ -919,9 +888,9 @@
             <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>
@@ -938,14 +907,7 @@
             <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)" />
@@ -962,14 +924,7 @@
             <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>
@@ -985,15 +940,8 @@
             <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>
@@ -1013,14 +961,9 @@
             <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>
@@ -1037,14 +980,8 @@
             <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>
@@ -1078,5 +1015,5 @@
                 <text key="name" text="Name" />
                 <text key="operator" text="Operator" />
-                <check key="toilets" text="Toilets" default="off" />
+                <check key="toilets" text="Toilets" />
             </optional>
         </item>
@@ -1094,6 +1031,6 @@
             <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>
@@ -1110,7 +1047,7 @@
                  <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>
@@ -1147,7 +1084,7 @@
             <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">
@@ -1235,10 +1172,5 @@
             <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" />
@@ -1258,10 +1190,5 @@
             <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" />
@@ -1276,13 +1203,6 @@
             <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">
@@ -1290,10 +1210,5 @@
             <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">
@@ -1302,18 +1217,10 @@
             <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">
@@ -1336,11 +1243,5 @@
             <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 *** -->
@@ -1384,7 +1285,5 @@
             <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">
@@ -1399,7 +1298,5 @@
             <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">
@@ -1410,7 +1307,5 @@
             <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">
@@ -1424,7 +1319,5 @@
             <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">
@@ -1443,7 +1336,5 @@
             <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 *** -->
@@ -1454,14 +1345,6 @@
             <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">
@@ -1475,14 +1358,6 @@
             <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">
@@ -1495,42 +1370,18 @@
             <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">
@@ -1538,11 +1389,6 @@
             <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">
@@ -1551,14 +1397,6 @@
             <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">
@@ -1571,8 +1409,5 @@
                 <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">
@@ -1582,8 +1417,5 @@
             <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">
@@ -1591,11 +1423,5 @@
             <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" />
@@ -1620,6 +1446,6 @@
                 <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="width" text="Width (meters)" />
                 <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" />
                 <check key="toll" text="Toll" />
@@ -1639,8 +1465,7 @@
             <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" />
+                <reference ref="name_layer" />
+                <text key="width" text="Width (meters)" />
                 <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>
@@ -1660,6 +1485,5 @@
             <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>
@@ -1677,6 +1501,5 @@
             <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>
@@ -1698,6 +1521,5 @@
             <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" />
@@ -1830,5 +1652,5 @@
                   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">
@@ -2185,14 +2007,9 @@
             <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>
@@ -2232,7 +2049,7 @@
             <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>
@@ -2250,9 +2067,9 @@
             <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>
@@ -2277,12 +2094,11 @@
             <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>
@@ -2292,6 +2108,5 @@
             <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" />
@@ -2309,11 +2124,10 @@
             <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>
@@ -2326,11 +2140,10 @@
             <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>
@@ -2340,12 +2153,11 @@
             <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>
@@ -2358,6 +2170,5 @@
             <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" />
@@ -2370,6 +2181,5 @@
             <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" />
@@ -2382,6 +2192,5 @@
             <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" />
@@ -2394,6 +2203,5 @@
             <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" />
@@ -2406,6 +2214,5 @@
             <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" />
@@ -2417,6 +2224,5 @@
             <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" />
@@ -2488,10 +2294,10 @@
             <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">
@@ -2511,10 +2317,10 @@
             <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/>
@@ -2538,24 +2344,24 @@
                 <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>
@@ -2569,13 +2375,10 @@
             <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/>
@@ -2591,8 +2394,5 @@
             <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">
@@ -2600,8 +2400,5 @@
             <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">
@@ -2611,8 +2408,5 @@
             <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">
@@ -2620,8 +2414,5 @@
             <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" />
@@ -2640,8 +2431,5 @@
             <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>
@@ -2659,6 +2447,5 @@
             <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>
@@ -2685,5 +2472,5 @@
             <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:">
@@ -2718,10 +2505,9 @@
             <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">
@@ -2772,6 +2558,5 @@
             <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)" />
@@ -2799,6 +2584,5 @@
             <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" />
@@ -2914,6 +2698,6 @@
             <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>
@@ -2928,13 +2712,12 @@
             <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>
@@ -2985,5 +2768,5 @@
             <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/>
@@ -3024,5 +2807,5 @@
             <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 -->
@@ -3155,17 +2938,10 @@
             <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" />
-            <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="internet_smoking_wheelchair" />
+            <space />
+            <reference ref="contact" />
         </item>
         <item name="Motel" icon="styles/standard/accommodation/motel.png" type="node,closedway">
@@ -3177,17 +2953,10 @@
             <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" />
-            <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="internet_smoking_wheelchair" />
+            <space />
+            <reference ref="contact" />
         </item>
         <item name="Guest House" icon="styles/standard/accommodation/guest_house.png" type="node,closedway">
@@ -3199,17 +2968,10 @@
             <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" />
-            <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="internet_smoking_wheelchair" />
+            <space />
+            <reference ref="contact" />
         </item>
         <item name="Chalet" icon="styles/standard/accommodation/chalet.png" type="node,closedway">
@@ -3222,17 +2984,10 @@
             <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" />
-            <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="internet_smoking_wheelchair" />
+            <space />
+            <reference ref="contact" />
         </item>
         <item name="Hostel" icon="presets/hostel.png" type="node,closedway">
@@ -3246,17 +3001,10 @@
             <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" />
-            <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="internet_smoking_wheelchair" />
+            <space />
+            <reference ref="contact" />
         </item>
         <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut.png" type="node,closedway">
@@ -3270,17 +3018,10 @@
             <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" />
-            <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="internet_smoking_wheelchair" />
+            <space />
+            <reference ref="contact" />
         </item>
         <separator/>
@@ -3293,22 +3034,15 @@
             <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" />
-            <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <check key="power_supply" text="Power supply" />
+            <check key="tents" text="Tents allowed" />
+            <space />
+            <reference ref="contact" />
         </item>
         <item name="Camping Site" icon="presets/tent.png" type="node,closedway">
@@ -3324,17 +3058,10 @@
             <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" />
-            <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="internet_smoking_wheelchair" />
+            <space />
+            <reference ref="contact" />
         </item>
     </group> <!-- Accomodation -->
@@ -3351,20 +3078,13 @@
             <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" />
-            <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="internet_smoking_wheelchair" />
+            <space />
+            <reference ref="contact" />
         </item>
         <item name="Fast Food" icon="presets/fastfood.png" type="node,closedway">
@@ -3377,18 +3097,11 @@
             <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" />
-            <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" />
-            <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="oh" />
+            <space />
+            <reference ref="internet_smoking_wheelchair" />
+            <space />
+            <reference ref="contact" />
         </item>
         <item name="Food Court" icon="presets/fastfood.png" type="node,closedway">
@@ -3400,17 +3113,9 @@
             <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" />
-            <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" />
-            <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="name_operator_oh" />
+            <space />
+            <reference ref="internet_smoking_wheelchair" />
+            <space />
+            <reference ref="contact" />
         </item>
         <item name="Cafe" icon="presets/cafe.png" type="node,closedway">
@@ -3427,18 +3132,11 @@
             <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" />
-            <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" />
-            <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="oh" />
+            <space />
+            <reference ref="internet_smoking_wheelchair" />
+            <space />
+            <reference ref="contact" />
         </item>
         <item name="Pub" icon="presets/pub.png" type="node,closedway">
@@ -3451,18 +3149,11 @@
             <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" />
-            <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" />
-            <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="name_operator" />
+            <check key="microbrewery" text="Microbrewery" />
+            <reference ref="oh" />
+            <space />
+            <reference ref="internet_smoking_wheelchair" />
+            <space />
+            <reference ref="contact" />
         </item>
         <item name="Biergarten" icon="presets/biergarten.png" type="node,closedway">
@@ -3475,18 +3166,11 @@
             <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" />
-            <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" />
-            <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="name_operator" />
+            <check key="microbrewery" text="Microbrewery" />
+            <reference ref="oh" />
+            <space />
+            <reference ref="internet_smoking_wheelchair" />
+            <space />
+            <reference ref="contact" />
         </item>
         <item name="Bar" icon="presets/bar.png" type="node,closedway">
@@ -3502,17 +3186,9 @@
             <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" />
-            <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" />
-            <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="name_operator_oh" />
+            <space />
+            <reference ref="internet_smoking_wheelchair" />
+            <space />
+            <reference ref="contact" />
         </item>
         <item name="Nightclub" icon="presets/bar.png" type="node,closedway">
@@ -3529,15 +3205,10 @@
             <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">
@@ -3550,17 +3221,9 @@
             <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" />
-            <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" />
-            <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="name_operator_oh" />
+            <space />
+            <reference ref="internet_smoking_wheelchair" />
+            <space />
+            <reference ref="contact" />
         </item>
     </group> <!-- Food+Drinks -->
@@ -3570,6 +3233,5 @@
             <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">
@@ -3585,5 +3247,5 @@
             <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/>
@@ -3599,6 +3261,5 @@
             <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" />
@@ -3615,9 +3276,9 @@
             <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" />
@@ -3648,9 +3309,9 @@
             <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" />
@@ -3711,7 +3372,5 @@
             <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">
@@ -3723,12 +3382,8 @@
             <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">
@@ -3746,9 +3401,9 @@
             <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"
@@ -3759,12 +3414,7 @@
             <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" />
-            <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="name_operator_oh" />
+            <space />
+            <reference ref="contact" />
         </item>
         <item name="Water Park" icon="presets/swimming.png" type="node,closedway">
@@ -3779,12 +3429,7 @@
             <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" />
-            <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="name_operator_oh" />
+            <space />
+            <reference ref="contact" />
         </item>
         <item name="Sauna" de.name="Sauna" icon="presets/sauna.png" type="node,closedway">
@@ -3796,13 +3441,10 @@
             <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" />                                           
-            <space />
-            <text key="phone" text="Phone Number" />
-            <text key="fax" text="Fax Number" />
-            <text key="website" text="Website" />
-            <text key="email" text="Email Address" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+            <reference ref="oh" />
+            <combo key="access" text="Access" values="yes,permissive,private,unknown" />
+            <space />
+            <reference ref="contact" />
         </item>
         <item name="Horse riding" icon="presets/equestrian.png" type="node,closedway">
@@ -3811,13 +3453,8 @@
             <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">
@@ -3832,16 +3469,11 @@
             <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">
@@ -3865,5 +3497,5 @@
             <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">
@@ -3874,9 +3506,9 @@
                   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">
@@ -3905,7 +3537,5 @@
             <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>
@@ -3919,6 +3549,5 @@
             <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">
@@ -3934,7 +3563,5 @@
             <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">
@@ -3968,11 +3595,10 @@
                   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 -->
@@ -4000,5 +3626,5 @@
             <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,greek_catholic,greek_orthodox,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,orthodox,pentecostal,presbyterian,protestant,quaker,roman_catholic,russian_orthodox,seventh_day_adventist" values_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">
@@ -4024,5 +3650,5 @@
             <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">
@@ -4048,5 +3674,5 @@
             <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">
@@ -4071,5 +3697,5 @@
             <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">
@@ -4094,5 +3720,5 @@
             <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">
@@ -4116,5 +3742,5 @@
             <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">
@@ -4138,5 +3764,5 @@
             <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 -->
@@ -4173,9 +3799,8 @@
                   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">
@@ -4253,6 +3878,5 @@
             <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 -->
@@ -4312,6 +3936,5 @@
             <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>
@@ -4330,6 +3953,5 @@
             <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">
@@ -4349,6 +3971,5 @@
             <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">
@@ -4356,6 +3977,5 @@
             <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">
@@ -4363,6 +3983,5 @@
             <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">
@@ -4377,6 +3996,5 @@
             <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>
@@ -4396,5 +4014,5 @@
             <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">
@@ -4405,7 +4023,5 @@
             <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/>
@@ -4425,5 +4041,5 @@
             <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/>
@@ -4458,6 +4074,5 @@
             <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 -->
@@ -4513,10 +4128,10 @@
             <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">
@@ -4528,5 +4143,5 @@
         </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"
@@ -4548,6 +4163,6 @@
             <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>
@@ -4569,8 +4184,8 @@
                 <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>
@@ -4589,10 +4204,10 @@
             <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>
@@ -4643,5 +4258,5 @@
             <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>
@@ -4667,5 +4282,5 @@
             <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" />
@@ -4687,6 +4302,5 @@
             <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 />
@@ -4739,6 +4353,5 @@
             <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">
@@ -4746,6 +4359,5 @@
             <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 -->
@@ -4909,6 +4521,5 @@
             <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">
@@ -4917,6 +4528,5 @@
             <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">
@@ -4925,6 +4535,5 @@
             <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">
@@ -4933,6 +4542,5 @@
             <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">
@@ -4941,6 +4549,5 @@
             <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" />
@@ -4956,6 +4563,5 @@
             <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">
@@ -4965,6 +4571,5 @@
             <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">
@@ -4973,6 +4578,5 @@
             <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">
@@ -4981,25 +4585,22 @@
             <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"
@@ -5018,6 +4619,5 @@
             <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">
@@ -5026,6 +4626,5 @@
             <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">
@@ -5034,6 +4633,5 @@
             <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">
@@ -5050,6 +4648,5 @@
             <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">
@@ -5067,6 +4664,5 @@
             <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">
@@ -5092,6 +4688,5 @@
             <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) -->
@@ -5216,9 +4811,8 @@
             <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">
@@ -5273,6 +4867,6 @@
             <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">
@@ -5290,5 +4884,5 @@
             <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/>
@@ -5306,9 +4900,8 @@
                   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"
@@ -5331,8 +4924,8 @@
                   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"
@@ -5387,17 +4980,16 @@
                   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">
@@ -5471,6 +5063,5 @@
             <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" />
@@ -5500,6 +5091,5 @@
             <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" />
@@ -5678,6 +5268,5 @@
             <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">
@@ -5690,6 +5279,5 @@
             <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">
@@ -5764,6 +5352,5 @@
             <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">
@@ -5776,6 +5363,5 @@
             <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">
@@ -5789,6 +5375,5 @@
             <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/>
@@ -5806,6 +5391,5 @@
             <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">
@@ -5820,6 +5404,5 @@
             <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">
@@ -5829,9 +5412,7 @@
                   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">
@@ -5845,8 +5426,6 @@
             <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"
@@ -5860,6 +5439,5 @@
             <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/>
@@ -5874,9 +5452,7 @@
                   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" />
@@ -5889,8 +5465,7 @@
                   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" />
@@ -5904,7 +5479,6 @@
             <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" />
@@ -5936,6 +5510,5 @@
             <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">
@@ -5947,6 +5520,5 @@
             <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 -->
@@ -5962,6 +5534,5 @@
             <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" />
@@ -5976,7 +5547,5 @@
             <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">
@@ -5988,6 +5557,5 @@
             <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" />
@@ -6001,6 +5569,5 @@
             <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">
@@ -6011,6 +5578,5 @@
             <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/>
@@ -6024,6 +5590,5 @@
             <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">
@@ -6035,6 +5600,5 @@
             <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">
@@ -6042,6 +5606,5 @@
             <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">
@@ -6052,7 +5615,5 @@
             <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 -->
@@ -6066,6 +5627,5 @@
             <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">
@@ -6077,6 +5637,5 @@
             <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">
@@ -6087,7 +5646,5 @@
             <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">
@@ -6098,7 +5655,5 @@
             <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">
@@ -6110,6 +5665,5 @@
             <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">
@@ -6121,6 +5675,5 @@
             <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 -->
@@ -6140,8 +5693,5 @@
             <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>
@@ -6156,6 +5706,5 @@
             <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">
@@ -6176,5 +5725,5 @@
             <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">
@@ -6185,6 +5734,5 @@
             <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 -->
@@ -6199,7 +5747,5 @@
             <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">
@@ -6211,7 +5757,5 @@
             <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/>
@@ -6225,6 +5769,5 @@
             <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">
@@ -6238,6 +5781,5 @@
             <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">
@@ -6248,6 +5790,5 @@
             <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">
@@ -6258,7 +5799,5 @@
             <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">
@@ -6272,7 +5811,5 @@
             <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" />
@@ -6287,7 +5824,5 @@
             <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/>
@@ -6302,6 +5837,5 @@
             <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">
@@ -6316,7 +5850,5 @@
             <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/>
@@ -6331,7 +5863,5 @@
             <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">
@@ -6343,6 +5873,5 @@
             <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">
@@ -6354,7 +5883,5 @@
             <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/>
@@ -6363,8 +5890,5 @@
             <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">
@@ -6377,8 +5901,5 @@
             <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">
@@ -6389,7 +5910,5 @@
             <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">
@@ -6401,7 +5920,5 @@
             <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/>
@@ -6414,6 +5931,5 @@
             <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">
@@ -6425,7 +5941,5 @@
             <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">
@@ -6438,7 +5952,5 @@
             <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>
@@ -6452,6 +5964,5 @@
             <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/>
@@ -6462,7 +5973,5 @@
             <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">
@@ -6473,7 +5982,5 @@
             <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">
@@ -6482,8 +5989,7 @@
                   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">
@@ -6494,7 +6000,5 @@
             <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 -->
@@ -6505,5 +6009,5 @@
                   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" />
@@ -6511,10 +6015,10 @@
         <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 -->
@@ -6941,9 +6445,9 @@
                   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" />
@@ -7084,9 +6588,9 @@
                   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"
@@ -7163,6 +6667,5 @@
             <space />
             <key key="landuse" value="quarry" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
         </item>
     </group> <!-- Landuse -->
@@ -7390,6 +6893,5 @@
             <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" />
@@ -7514,6 +7016,5 @@
             <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)" />
@@ -7532,6 +7033,5 @@
             <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" />
Index: /trunk/data/tagging-preset.xsd
===================================================================
--- /trunk/data/tagging-preset.xsd	(revision 6557)
+++ /trunk/data/tagging-preset.xsd	(revision 6558)
@@ -100,5 +100,5 @@
     </complexType>
 
-	<group name="optional_elements">
+    <group name="optional_elements">
 		<choice>
 			<element name="label" type="tns:label" />
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java	(revision 6557)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java	(revision 6558)
@@ -10,7 +10,11 @@
 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,4 +48,18 @@
 
         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;
     }
     
@@ -65,5 +83,7 @@
         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;
@@ -71,4 +91,7 @@
         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) {
@@ -78,5 +101,40 @@
         }
         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);