--- data/defaultpresets.xml
+++ data/defaultpresets.xml
@@ -165,10 +165,14 @@
     <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,sett" />
     </chunk>
+    <chunk id="riding_surface">
+        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="riding" />
+        <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
+    </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="maxspeed" />
         <reference ref="surface" />
     </chunk>
     <chunk id="highway_yesno_incline">
@@ -176,7 +180,7 @@
         <check key="tunnel" text="Tunnel" disable_off="true" />
         <check key="cutting" text="Cutting" disable_off="true" />
         <check key="embankment" text="Embankment" disable_off="true" />
-        <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down"/>
+        <reference ref="incline" />
     </chunk>
     <chunk id="highway_yesno_incline_oneway">
         <check key="oneway" text="Oneway" />
@@ -184,11 +188,34 @@
     </chunk>
     <chunk id="highway_yesno_incline_oneway_lit">
         <reference ref="highway_yesno_incline_oneway" />
-        <check key="lit" text="Lit" />
+        <reference ref="lit_yesno" />
     </chunk>
     <chunk id="highway_yesno_incline_oneway_lit_width">
         <reference ref="highway_yesno_incline_oneway_lit" />
-        <text key="width" text="Width (meters)" />
+        <reference ref="width" />
+    </chunk>
+    <chunk id="highway_yesno_oneway_bridge_tunnel_cutting_embankment_lit_toll">
+        <checkgroup columns="4">
+            <check key="oneway" text="Oneway" default="on" />
+            <check key="bridge" text="Bridge" disable_off="true" />
+            <check key="tunnel" text="Tunnel" disable_off="true" />
+            <check key="cutting" text="Cutting" disable_off="true" />
+            <check key="embankment" text="Embankment" disable_off="true" />
+            <reference ref="lit_yesno" />
+            <check key="toll" text="Toll" />
+        </checkgroup>
+    </chunk>
+    <chunk id="highway_yesno_oneway_motorroad_bridge_tunnel_cutting_embankment_lit_toll">
+        <checkgroup columns="4">
+            <check key="oneway" text="Oneway" default="on" />
+            <check key="motorroad" text="Motorroad" default="on" />
+            <check key="bridge" text="Bridge" disable_off="true" />
+            <check key="tunnel" text="Tunnel" disable_off="true" />
+            <check key="cutting" text="Cutting" disable_off="true" />
+            <check key="embankment" text="Embankment" disable_off="true" />
+            <reference ref="lit_yesno" />
+            <check key="toll" text="Toll" />
+        </checkgroup>
     </chunk>
     <chunk id="railway_service">
         <combo key="service" text="Service type" values="yard,siding,spur" />
@@ -204,6 +231,18 @@
         <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
         <reference ref="railway_electrified" />
     </chunk>
+    <chunk id="aerialway_capacity">
+        <text key="aerialway:capacity" text="Number of people per hour" />
+    </chunk>
+    <chunk id="aerialway_duration">
+        <text key="aerialway:duration" text="Typical journey time in minutes" />
+    </chunk>
+    <chunk id="aerialway_bubble">
+        <check key="aerialway:bubble" text="Has bubble?" />
+    </chunk>
+    <chunk id="aerialway_heating">
+        <check key="aerialway:heating" text="Has heating?" />
+    </chunk>
     <chunk id="barrier_5">
         <optional text="Allowed traffic:">
             <check key="foot" text="Foot" default="on"/>
@@ -231,33 +270,57 @@
         <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="email" text="Email Address"/>
     </chunk>
-    <chunk id="name_ref">
-        <text key="name" text="Name" />
-        <text key="ref" text="Reference" />
+    <chunk id="website">
+        <text key="website" text="Website" />
     </chunk>
-    <chunk id="name_ref_operator">
-        <text key="name" text="Name" />
-        <text key="ref" text="Reference" />
-        <text key="operator" text="Operator" />
+    <chunk id="wikipedia">
+        <text key="wikipedia" text="Wikipedia" />
     </chunk>
-    <chunk id="name_operator">
-        <text key="name" text="Name" />
+    <chunk id="operator">
         <text key="operator" text="Operator" />
     </chunk>
-    <chunk id="name_layer">
+    <chunk id="network">
+        <text key="network" text="Network" />
+    </chunk>
+    <chunk id="ref">
+        <text key="ref" text="Reference" />
+    </chunk>
+    <chunk id="ref_number">
+        <text key="ref" text="Reference number" />
+    </chunk>
+    <chunk id="fee">
+        <combo key="fee" text="Fee" values="yes,no" />
+    </chunk>
+    <chunk id="description">
+        <text key="description" text="Description" />
+    </chunk>
+    <chunk id="closer_description">
+        <text key="description" text="Closer description" />
+    </chunk>
+    <chunk id="name">
         <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="service_times">
-        <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 09:30,11:00|Sa,Su,PH 09: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" />
+    <chunk id="name_ref">
+        <reference ref="name" />
+        <reference ref="ref" />
     </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 id="name_ref_operator">
+        <reference ref="name" />
+        <reference ref="ref" />
+        <reference ref="operator" />
+    </chunk>
+    <chunk id="name_operator">
+        <reference ref="name" />
+        <reference ref="operator" />
+    </chunk>
+    <chunk id="name_layer">
+        <reference ref="name" />
+        <reference ref="layer" />
     </chunk>
     <chunk id="name_oh">
-        <text key="name" text="Name" />
+        <reference ref="name" />
         <reference ref="oh" />
     </chunk>
     <chunk id="name_operator_oh">
@@ -265,25 +328,86 @@
         <reference ref="oh" />
     </chunk>
     <chunk id="name_brand_operator_oh">
-        <text key="name" text="Name" />
+        <reference ref="name" />
         <text key="brand" text="Brand" />
-        <text key="operator" text="Operator" />
+        <reference ref="operator" />
         <reference ref="oh" />
     </chunk>
     <chunk id="name_brand_oh">
-        <text key="name" text="Name" />
+        <reference ref="name" />
         <text key="brand" text="Brand" />
         <reference ref="oh" />
     </chunk>
-    <chunk id="internet_smoking_wheelchair">
+    <chunk id="name_leisure_pitch">
+        <reference ref="name" />
+        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
+    </chunk>
+    <chunk id="name_leisure_type">
+        <reference ref="name" />
+        <reference ref="leisure_type" />
+    </chunk>
+    <chunk id="name_wikipedia">
+        <reference ref="name" />
+        <reference ref="wikipedia" />
+    </chunk>
+    <chunk id="name_wikipedia_elevation">
+        <reference ref="name_wikipedia" />
+        <reference ref="elevation" />
+    </chunk>
+    <chunk id="sport">
+        <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
+    </chunk>
+    <chunk id="leisure_type">
+        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+    </chunk>
+    <chunk id="layer">
+        <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+    </chunk>
+    <chunk id="service_times">
+        <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 09:30,11:00|Sa,Su,PH 09: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" />
+    </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="internet">
         <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" />
+    </chunk>
+    <chunk id="smoking_wheelchair">
         <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
         <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
     </chunk>
+    <chunk id="internet_smoking_wheelchair">
+        <reference ref="internet" />
+        <reference ref="smoking_wheelchair" />
+    </chunk>
+    <chunk id="capacity">
+        <text key="capacity" text="Capacity" />
+    </chunk>
+    <chunk id="maxspeed">
+        <text key="maxspeed" text="Max. speed (km/h)" />
+    </chunk>
+    <chunk id="incline">
+        <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+    </chunk>
+    <chunk id="length">
+        <text key="length" text="Length (meters)" length="7" />
+    </chunk>
+    <chunk id="width">
+        <text key="width" text="Width (meters)" length="7" />
+    </chunk>
+    <chunk id="height">
+        <text key="height" text="Height (meters)" length="7" />
+    </chunk>
+    <chunk id="elevation">
+        <text key="ele" text="Elevation" />
+    </chunk>
+    <chunk id="stars">
+        <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+    </chunk>
     <chunk id="optional_height">
         <optional>
-            <text key="height" text="Height (meters)" length="7" />
+            <reference ref="height" />
         </optional>
     </chunk>
     <chunk id="optional_maxwidth">
@@ -297,10 +421,6 @@
             <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>
     <chunk id="payment_base">
         <check key="payment:coins" text="Coins" />
         <check key="payment:notes" text="Notes" />
@@ -313,18 +433,21 @@
         <check key="payment:account_cards" text="Account or loyalty cards" />
     </chunk>
     <chunk id="parking_name_type_ref">
-        <text key="name" text="Name" />
+        <reference ref="name" />
         <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
-        <text key="ref" text="Reference number" />
+        <reference ref="ref_number" />
     </chunk>
     <chunk id="parking_access_fee_operator_surface">
         <space />
         <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
         <combo key="fee" text="Fee" values="yes,no,interval" />
-        <text key="operator" text="Operator" />
+        <reference ref="operator" />
         <reference ref="surface" />
         <space />
     </chunk>
+    <chunk id="organic">
+        <combo key="organic" text="Organic" values="only,yes,no" />
+    </chunk>
     <chunk id="stay">
         <combo key="stay" text="Time Limit (minutes)" values="0,30-60,30-180,30+" />
     </chunk>
@@ -333,17 +456,16 @@
         <combo key="lit" text="Lit" values="yes,no,interval" />
         <reference ref="oh" />
     </chunk>
+    <chunk id="lit_yesno">
+        <check key="lit" text="Lit" />
+    </chunk>
     <chunk id="general_access">
         <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" values_searchable="true" />
     </chunk>
-    <chunk id="name_wikipedia">
-        <text key="name" text="Name" />
-        <text key="wikipedia" text="Wikipedia" />
-    </chunk>
     <chunk id="population_postcode_website">
         <text key="population" text="Population" />
         <text key="addr:postcode" text="Post code" />
-        <text key="website" text="Website" />
+        <reference ref="website" />
     </chunk>
     <chunk id="route_hikebike_optionals">
         <text key="distance" text="Distance (km)"/>
@@ -353,12 +475,20 @@
         <text key="symbol" text="Symbol description"/>
         <text key="description" text="Description"/>
     </chunk>
+    <chunk id="genus_species">
+        <text key="genus" text="Genus" />
+        <text key="species" text="Species" />
+    </chunk>
+    <chunk id="genus_species_taxon">
+        <reference ref="genus_species" />
+        <text key="taxon" text="Taxon" />
+    </chunk>
     <chunk id="leaf">
         <combo key="leaf_type" text="Type" values="broadleaved,needleleaved,mixed,leafless" />
         <combo key="leaf_cycle" text="Cycle" values="deciduous,evergreen,semi_deciduous,semi_evergreen,mixed" />
     </chunk>
     <chunk id="religious">
-        <text key="name" text="Name" />
+        <reference ref="name" />
         <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" />
         <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
     </chunk>
@@ -373,8 +503,8 @@
         <reference ref="frequency" />
     </chunk>
     <chunk id="ref_operator_branch">
-        <text key="ref" text="Reference" />
-        <text key="operator" text="Operator" />
+        <reference ref="ref" />
+        <reference ref="operator" />
         <text key="branch" text="Branch operator" />
     </chunk>
     <chunk id="cable_circuit">
@@ -445,19 +575,11 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=motorway" />
             <space />
             <key key="highway" value="motorway" />
-            <text key="ref" text="Reference" />
+            <reference ref="ref" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <reference ref="highway_base" />
-                <checkgroup columns="4">
-                    <check key="oneway" text="Oneway" default="on" />
-                    <check key="bridge" text="Bridge" disable_off="true" />
-                    <check key="tunnel" text="Tunnel" disable_off="true" />
-                    <check key="cutting" text="Cutting" disable_off="true" />
-                    <check key="embankment" text="Embankment" disable_off="true" />
-                    <check key="lit" text="Lit" />
-                    <check key="toll" text="Toll" />
-                </checkgroup>
+                <reference ref="highway_yesno_oneway_bridge_tunnel_cutting_embankment_lit_toll" />
             </optional>
         </item>
         <item name="Motorway Link" icon="presets/motorway.png" type="way" preset_name_label="true">
@@ -473,15 +595,7 @@
             <key key="highway" value="motorway_link" />
             <optional>
                 <reference ref="highway_base" />
-                <checkgroup columns="4">
-                    <check key="oneway" text="Oneway" default="on" />
-                    <check key="bridge" text="Bridge" disable_off="true" />
-                    <check key="tunnel" text="Tunnel" disable_off="true" />
-                    <check key="cutting" text="Cutting" disable_off="true" />
-                    <check key="embankment" text="Embankment" disable_off="true" />
-                    <check key="lit" text="Lit" />
-                    <check key="toll" text="Toll" />
-                </checkgroup>
+                <reference ref="highway_yesno_oneway_bridge_tunnel_cutting_embankment_lit_toll" />
             </optional>
         </item>
         <item name="Trunk" icon="presets/trunk.png" type="way" preset_name_label="true">
@@ -496,20 +610,11 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=trunk" />
             <space />
             <key key="highway" value="trunk" />
-            <text key="ref" text="Reference" />
+            <reference ref="ref" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <reference ref="highway_base" />
-                <checkgroup columns="4">
-                    <check key="oneway" text="Oneway" default="on" />
-                    <check key="motorroad" text="Motorroad" default="on" />
-                    <check key="bridge" text="Bridge" disable_off="true" />
-                    <check key="tunnel" text="Tunnel" disable_off="true" />
-                    <check key="cutting" text="Cutting" disable_off="true" />
-                    <check key="embankment" text="Embankment" disable_off="true" />
-                    <check key="lit" text="Lit" />
-                    <check key="toll" text="Toll" />
-                </checkgroup>
+                <reference ref="highway_yesno_oneway_motorroad_bridge_tunnel_cutting_embankment_lit_toll" />
             </optional>
         </item>
         <item name="Trunk Link" icon="presets/trunk.png" type="way" preset_name_label="true">
@@ -522,19 +627,10 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)" />
             <space />
             <key key="highway" value="trunk_link" />
-            <text key="ref" text="Reference" />
+            <reference ref="ref" />
             <optional>
                 <reference ref="highway_base" />
-                <checkgroup columns="4">
-                    <check key="oneway" text="Oneway" default="on" />
-                    <check key="motorroad" text="Motorroad" default="on" />
-                    <check key="bridge" text="Bridge" disable_off="true" />
-                    <check key="tunnel" text="Tunnel" disable_off="true" />
-                    <check key="cutting" text="Cutting" disable_off="true" />
-                    <check key="embankment" text="Embankment" disable_off="true" />
-                    <check key="lit" text="Lit" />
-                    <check key="toll" text="Toll" />
-                </checkgroup>
+                <reference ref="highway_yesno_oneway_motorroad_bridge_tunnel_cutting_embankment_lit_toll" />
             </optional>
         </item>
         <separator/>
@@ -550,9 +646,9 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=primary" />
             <space />
             <key key="highway" value="primary" />
-            <text key="ref" text="Reference" />
+            <reference ref="ref" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <reference ref="highway_base" />
                 <check key="motorroad" text="Motorroad" />
                 <reference ref="highway_yesno_incline_oneway_lit" />
@@ -586,9 +682,9 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=secondary" />
             <space />
             <key key="highway" value="secondary" />
-            <text key="ref" text="Reference" />
+            <reference ref="ref" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit" />
             </optional>
@@ -621,9 +717,9 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=tertiary" />
             <space />
             <key key="highway" value="tertiary" />
-            <text key="ref" text="Reference" />
+            <reference ref="ref" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit" />
             </optional>
@@ -654,12 +750,11 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=unclassified" />
             <key key="highway" value="unclassified" />
             <optional>
-                <text key="name" text="Name" />
-                <text key="ref" text="Reference" />
+                <reference ref="name_ref" />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit" />
                 <check key="passing_places" text="Passing Places" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </optional>
         </item>
         <item name="Residential" icon="presets/residential.png" type="way,closedway" preset_name_label="true">
@@ -675,12 +770,12 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=residential" />
             <space />
             <key key="highway" value="residential" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional>
-                <text key="ref" text="Reference" />
+                <reference ref="ref" />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </optional>
         </item>
         <item name="Bicycle Road" icon="presets/bicycle_road.svg" type="way" preset_name_label="true">
@@ -691,7 +786,7 @@
             <key key="bicycle_road" value="yes" />
             <key key="bicycle" value="designated" />
             <combo key="highway" text="Highway type" values="residential,service,unclassified,path,cycleway" values_context="Highway" default="residential" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="vehicle" text="Vehicle access" values="yes,no,destination" default="no" />
             <text key="maxspeed" text="Max. speed (km/h)" default="30" />
             <optional>
@@ -701,8 +796,8 @@
                 <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)" />
+                <reference ref="lit_yesno" />
+                <reference ref="width" />
             </optional>
         </item>
         <item name="Living Street" icon="presets/living_street.png" type="way,closedway" preset_name_label="true">
@@ -716,13 +811,13 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=living_street" />
             <space />
             <key key="highway" value="living_street" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional>
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+                <reference ref="layer" />
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
                 <reference ref="surface" />
                 <reference ref="highway_yesno_incline_oneway_lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </optional>
         </item>
         <item name="Pedestrian" icon="presets/pedestrian.png" type="way,closedway,relation" preset_name_label="true">
@@ -738,15 +833,15 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=pedestrian" />
             <space />
             <key key="highway" value="pedestrian" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional>
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+                <reference ref="layer" />
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
                 <reference ref="surface" />
                 <check key="area" text="Area" />
                 <reference ref="highway_yesno_incline" />
-                <check key="lit" text="Lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="lit_yesno" />
+                <reference ref="width" />
             </optional>
         </item>
         <item name="Service" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
@@ -762,11 +857,11 @@
             <key key="highway" value="service" />
             <combo key="service" text="Service way type" values="alley,driveway,parking_aisle,drive-through" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit" />
                 <check key="passing_places" text="Passing Places" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </optional>
         </item>
         <item name="Parking Aisle" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
@@ -783,7 +878,7 @@
             <optional>
                 <reference ref="surface" />
                 <check key="oneway" text="Oneway" />
-                <check key="lit" text="Lit" />
+                <reference ref="lit_yesno" />
             </optional>
         </item>
         <item name="Road (Unknown Type)" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
@@ -797,7 +892,7 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=road" />
             <key key="highway" value="road" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
@@ -812,11 +907,11 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:construction" />
             <key key="highway" value="construction" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <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)" />
+                <reference ref="width" />
             </optional>
         </item>
         <separator/>
@@ -857,7 +952,7 @@
             <combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,private,no" match="key" />
             <combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,private,no" match="key" />
             <combo key="tourist_bus" text="Tourist buses" values="yes,no" match="key" />
-            <text key="maxspeed" text="Max. speed (km/h)" />
+            <reference ref="maxspeed" />
             <text key="minspeed" text="Min. speed (km/h)" match="key" />
             <text key="maxweight" text="Max. weight (tonnes)" match="key" />
             <text key="maxaxleload" text="Max. axleload (tonnes)" match="key" />
@@ -885,7 +980,7 @@
                 <reference ref="name_layer" />
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
                 <reference ref="highway_yesno_incline_oneway" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </optional>
         </item>
         <item name="Bridge" icon="presets/bridge.png" type="way" preset_name_label="true">
@@ -902,12 +997,12 @@
             <space />
             <combo key="bridge" text="Bridge" values="yes,aqueduct,cantilever,covered,low_water_crossing,movable,suspension,swing,trestle,viaduct" match="keyvalue" default="yes" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="1" length="3" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
+                <reference ref="maxspeed" />
                 <text key="maxweight" text="Max. weight (tonnes)" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="incline" />
+                <reference ref="width" />
                 <check key="toll" text="Toll" />
             </optional>
         </item>
@@ -921,8 +1016,8 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:ford" />
             <key key="ford" value="yes" />
             <optional>
-                <text key="name" text="Name" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+                <reference ref="name" />
+                <reference ref="incline" />
             </optional>
         </item>
     </group> <!-- Streets -->
@@ -952,7 +1047,7 @@
                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
                 <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
                 <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </optional>
         </item>
         <item name="Path" icon="presets/path.png" type="way,closedway" preset_name_label="true">
@@ -988,7 +1083,7 @@
                 <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" />
                 <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,private,no" />
                 <!-- <combo key="motorcar" text="Motorcar" values="yes,designated,no" default="no" /> -->
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </optional>
         </item>
         <separator/>
@@ -1003,10 +1098,10 @@
             <key key="highway" value="bridleway" />
             <optional>
                 <reference ref="name_layer" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
+                <reference ref="maxspeed" />
                 <reference ref="surface" />
                 <reference ref="highway_yesno_incline_oneway_lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </optional>
         </item>
         <item name="Cycle Lane/Track" type="way" preset_name_label="true">
@@ -1047,7 +1142,7 @@
                 <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)" />
+                <reference ref="width" />
             </optional>
         </item>
         <item name="Segregated Foot- and Cycleway" icon="presets/foot_and_cycleway_segregated.png" type="way" preset_name_label="true">
@@ -1062,7 +1157,7 @@
                 <reference ref="name_layer" />
                 <reference ref="surface" />
                 <reference ref="highway_yesno_incline_oneway_lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </optional>
         </item>
         <item name="Combined Foot- and Cycleway" icon="presets/foot_and_cycleway_combined.png" type="way" preset_name_label="true">
@@ -1078,7 +1173,7 @@
                 <reference ref="surface" />
                 <reference ref="highway_yesno_incline_oneway_lit" />
                 <check key="passing_places" text="Passing Places" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </optional>
         </item>
         <item name="Dedicated Footway" icon="presets/footway.png" type="way" preset_name_label="true">
@@ -1097,9 +1192,9 @@
                 <reference ref="name_layer" />
                 <reference ref="surface" />
                 <reference ref="highway_yesno_incline" />
-                <check key="lit" text="Lit" />
+                <reference ref="lit_yesno" />
                 <check key="bicycle" text="Bicycle" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </optional>
         </item>
         <item name="Steps" icon="presets/steps.png" type="way" preset_name_label="true">
@@ -1117,7 +1212,7 @@
                 <reference ref="surface" />
                 <text key="step_count" text="Amount of Steps" />
                 <reference ref="highway_yesno_incline_oneway_lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </optional>
         </item>
     </group> <!-- Ways -->
@@ -1131,7 +1226,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=motorway_junction" />
             <space />
             <key key="highway" value="motorway_junction" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <text key="ref" text="Number" />
             <text key="exit_to" text="Exit to" />
         </item>
@@ -1145,8 +1240,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=services" />
             <key key="highway" value="services" />
             <optional>
-                <text key="name" text="Name" />
-                <text key="operator" text="Operator" />
+                <reference ref="name_operator" />
                 <check key="toilets" text="Toilets" />
             </optional>
         </item>
@@ -1161,7 +1255,7 @@
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:highway=rest_area" />
             <key key="highway" value="rest_area" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <check key="toilets" text="Toilets" />
                 <check key="drinking_water" text="Drinking Water" />
             </optional>
@@ -1258,7 +1352,7 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:traffic_sign" />
             <space />
             <key key="traffic_sign" value="city_limit" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <text key="alt_name" text="Second Name" />
         </item>
         <item name="Speed Camera" icon="presets/speed_camera.png" type="node" preset_name_label="true">
@@ -1271,7 +1365,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=speed_camera" />
             <key key="highway" value="speed_camera" />
             <optional>
-                <text key="maxspeed" text="Max. speed (km/h)" />
+                <reference ref="maxspeed" />
             </optional>
         </item>
         <separator/>
@@ -1300,9 +1394,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:mountain_pass" />
             <key key="mountain_pass" value="yes" />
             <optional>
-                <text key="name" text="Name" />
-                <text key="ele" text="Elevation" />
-                <text key="wikipedia" text="Wikipedia" />
+                <reference ref="name_wikipedia_elevation" />
             </optional>
         </item>
     </group> <!-- Waypoints -->
@@ -1373,8 +1465,7 @@
                   zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Tag:barrier=toll_booth" />
             <key key="barrier" value="toll_booth" />
             <optional>
-                <text key="name" text="Name" />
-                <text key="operator" text="Operator" />
+                <reference ref="name_operator" />
             </optional>
         </item> <!-- toll_booth -->
         <item name="Border Control" icon="presets/douane.png" type="node" preset_name_label="true">
@@ -1394,10 +1485,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=hedge" />
             <key key="barrier" value="hedge" />
             <optional>
-                <text key="height" text="Height (meters)" length="7" />
-                <text key="genus" text="Genus" />
-                <text key="species" text="Species" />
-                <text key="taxon" text="Taxon" />
+                <reference ref="height" />
+                <reference ref="genus_species_taxon" />
             </optional>
         </item> <!-- hedge -->
         <item name="Fence" icon="presets/fence.png" type="way,closedway" preset_name_label="true">
@@ -1412,7 +1501,7 @@
             <key key="barrier" value="fence" />
             <optional>
                 <combo key="fence_type" text="Type" values="barbed_wire,chain_link,electric,metal,pole,split_rail,wire,wood" />
-                <text key="height" text="Height (meters)" length="7" />
+                <reference ref="height" />
             </optional>
         </item> <!-- fence -->
         <item name="Guard Rail" type="way" preset_name_label="true">
@@ -1577,11 +1666,11 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:tunnel" />
             <key key="tunnel" value="yes" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="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)" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+                <reference ref="width" />
+                <reference ref="maxspeed" />
+                <reference ref="incline" />
                 <check key="toll" text="Toll" />
             </optional>
         </item>
@@ -1598,9 +1687,9 @@
             <key key="tunnel" value="building_passage" />
             <optional>
                 <reference ref="name_layer" />
-                <text key="width" text="Width (meters)" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+                <reference ref="width" />
+                <reference ref="maxspeed" />
+                <reference ref="incline" />
             </optional>
         </item>
         <item name="Arcade" type="way" preset_name_label="true">
@@ -1617,7 +1706,7 @@
             <check key="arcade:right" value_on="open" text="Open on right side" />
             <optional>
                 <reference ref="name_layer" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </optional>
         </item>
         <item name="Colonnade" type="way" preset_name_label="true">
@@ -1632,7 +1721,7 @@
             <check key="colonnade:right" value_on="open" text="Open on right side" />
             <optional>
                 <reference ref="name_layer" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </optional>
         </item>
         <item name="Avalanche Protector" type="way" preset_name_label="true">
@@ -1651,8 +1740,8 @@
             <check key="avalanche_protector:right" value_on="open" text="Open on right side" />
             <optional>
                 <reference ref="name_layer" />
-                <text key="width" text="Width (meters)" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+                <reference ref="width" />
+                <reference ref="incline" />
             </optional>
         </item>
     </group>
@@ -1668,8 +1757,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=drain" />
             <space />
             <key key="waterway" value="drain" />
-            <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" />
+            <reference ref="layer" />
         </item>
         <item name="Ditch" icon="presets/waterway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch"
@@ -1679,8 +1768,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=ditch" />
             <space />
             <key key="waterway" value="ditch" />
-            <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" />
         </item>
         <item name="Stream" icon="presets/waterway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream"
@@ -1695,15 +1783,13 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=stream" />
             <space />
             <key key="waterway" value="stream" />
-            <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" />
         </item>
         <item name="Wadi" icon="presets/waterway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=wadi" />
             <space />
             <key key="waterway" value="wadi" />
-            <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" />
         </item>
         <item name="Canal" icon="presets/waterway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal"
@@ -1716,7 +1802,7 @@
             <space />
             <key key="waterway" value="canal" />
             <reference ref="name_wikipedia" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+            <reference ref="layer" />
         </item>
         <item name="River" icon="presets/river.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=river"
@@ -1730,7 +1816,7 @@
             <space />
             <key key="waterway" value="river" />
             <reference ref="name_wikipedia" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+            <reference ref="layer" />
         </item>
         <separator/>
         <item name="Spring" icon="presets/spring.png" type="node,closedway" preset_name_label="true">
@@ -1742,7 +1828,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=spring" />
             <space />
             <key key="natural" value="spring" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Waterfall" icon="presets/waterfall.png" type="node,way" preset_name_label="true">
             <space />
@@ -1759,7 +1845,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=weir" />
             <space />
             <key key="waterway" value="weir" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Dam" icon="presets/dam.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam"
@@ -1788,8 +1874,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=breakwater" />
             <space />
             <key key="man_made" value="breakwater" />
-            <text key="ref" text="Reference" />
-            <text key="name" text="Name" />
+            <reference ref="ref" />
+            <reference ref="name" />
         </item>
         <separator/>
         <item name="Culvert" icon="presets/tunnel.png" type="way" preset_name_label="true">
@@ -1801,17 +1887,17 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tunnel=culvert" />
             <key key="tunnel" value="culvert" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="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)" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+                <reference ref="width" />
+                <reference ref="incline" />
             </optional>
         </item>
         <separator/>
         <item name="Basin" icon="presets/landuse_water.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="landuse" value="basin" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Reservoir" icon="presets/landuse_water.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir"
@@ -1821,12 +1907,12 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=reservoir" />
             <space />
             <key key="landuse" value="reservoir" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Covered Reservoir" icon="presets/reservoir_covered.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="man_made" value="reservoir_covered" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <separator/>
         <item name="Water" icon="presets/water.png" type="node,closedway,relation" preset_name_label="true">
@@ -1839,13 +1925,13 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=water" />
             <space />
             <key key="natural" value="water" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="water" text="Water Body" values="canal,lake,lagoon,oxbow,pond,reservoir,river" match="key" values_searchable="true" />
         </item>
         <item name="Land" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="natural" value="land" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Coastline" icon="presets/coastline.png" type="node,way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline"
@@ -1857,7 +1943,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=coastline" />
             <space />
             <key key="natural" value="coastline" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Riverbank" icon="presets/waterway.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
@@ -1872,7 +1958,7 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:waterway=riverbank" />
             <space />
             <key key="waterway" value="riverbank" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <separator/>
         <item name="Wetland" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
@@ -1888,13 +1974,13 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=wetland" />
             <space />
             <key key="natural" value="wetland" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove" values_searchable="true" />
         </item>
         <item name="Mud" icon="presets/mud.png" type="node,closedway,relation" preset_name_label="true">
             <key key="natural" value="mud" />
             <space />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Beach" icon="presets/beach.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach"
@@ -1905,12 +1991,12 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=beach" />
             <space />
             <key key="natural" value="beach" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Bay" icon="presets/bay.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="natural" value="bay" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Cliff" icon="presets/cliff.png" type="node,way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff"
@@ -1921,7 +2007,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=cliff" />
             <space />
             <key key="natural" value="cliff" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
       </group> <!-- Water -->
     <group name="Shipping" icon="presets/ferry.png">
@@ -1935,7 +2021,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=ferry_terminal" />
             <space />
             <key key="amenity" value="ferry_terminal" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="cargo" text="Cargo" values="passengers,vehicle,bicycle,hgv,passengers;vehicle" values_context="cargo" />
         </item>
         <item name="Ferry Route" icon="presets/ferry.png" type="way,closedway,relation" preset_name_label="true">
@@ -1946,14 +2032,14 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:route=ferry" />
             <key key="route" value="ferry" />
             <optional>
-              <text key="name" text="Name" />
+              <reference ref="name" />
             </optional>
         </item>
         <separator/>
         <item name="Marina" icon="presets/marina.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="leisure" value="marina" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Pier" icon="presets/pier.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier"
@@ -1965,7 +2051,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=pier" />
             <space />
             <key key="man_made" value="pier" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Lock Gate" icon="presets/lock_gate.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate"
@@ -1992,7 +2078,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=slipway" />
             <key key="leisure" value="slipway" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
             </optional>
         </item>
         <item name="Boatyard" icon="presets/boatyard.png" type="node,closedway" preset_name_label="true">
@@ -2003,7 +2089,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=boatyard" />
             <space />
             <key key="waterway" value="boatyard" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Dock" icon="presets/boatyard.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock"
@@ -2012,7 +2098,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=dock" />
             <space />
             <key key="waterway" value="dock" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
     </group> <!-- Shipping -->
   </group>
@@ -2098,12 +2184,12 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=bus_guideway" />
             <key key="highway" value="bus_guideway" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <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" />
+                <reference ref="layer" />
                 <reference ref="surface" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="maxspeed" />
+                <reference ref="width" />
             </optional>
         </item>
         <separator/>
@@ -2179,7 +2265,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=switch"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=switch" />
             <key key="railway" value="switch" />
-            <text key="ref" text="Reference" />
+            <reference ref="ref" />
         </item>
     </group> <!-- Railway -->
     <group name="Aerialway" icon="presets/aerialway.png">
@@ -2190,11 +2276,11 @@
             <key key="aerialway" value="chair_lift" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
+                <reference ref="aerialway_capacity" />
                 <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?" />
-                <check key="aerialway:heating" text="Has heating?" />
+                <reference ref="aerialway_duration" />
+                <reference ref="aerialway_bubble" />
+                <reference ref="aerialway_heating" />
             </optional>
         </item>
         <item name="Drag Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
@@ -2203,8 +2289,8 @@
             <key key="aerialway" value="drag_lift" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
+                <reference ref="aerialway_capacity" />
+                <reference ref="aerialway_duration" />
             </optional>
         </item>
         <item name="Cable Car" icon="presets/cable_car.png" type="way" preset_name_label="true">
@@ -2218,10 +2304,10 @@
             <key key="aerialway" value="cable_car" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
+                <reference ref="aerialway_capacity" />
                 <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?" />
+                <reference ref="aerialway_duration" />
+                <reference ref="aerialway_heating" />
             </optional>
         </item>
         <item name="Gondola" icon="presets/aerialway.png" type="way" preset_name_label="true">
@@ -2233,10 +2319,10 @@
             <key key="aerialway" value="gondola" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
+                <reference ref="aerialway_capacity" />
                 <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?" />
+                <reference ref="aerialway_duration" />
+                <reference ref="aerialway_heating" />
             </optional>
         </item>
         <item name="Mixed Lift" type="way" preset_name_label="true">
@@ -2245,11 +2331,11 @@
             <key key="aerialway" value="mixed_lift" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
+                <reference ref="aerialway_capacity" />
                 <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?" />
-                <check key="aerialway:heating" text="Has heating?" />
+                <reference ref="aerialway_duration" />
+                <reference ref="aerialway_bubble" />
+                <reference ref="aerialway_heating" />
             </optional>
         </item>
         <item name="T-bar Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
@@ -2261,8 +2347,8 @@
             <key key="aerialway" value="t-bar" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
+                <reference ref="aerialway_capacity" />
+                <reference ref="aerialway_duration" />
             </optional>
         </item>
         <item name="J-bar Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
@@ -2271,8 +2357,8 @@
             <key key="aerialway" value="j-bar" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
+                <reference ref="aerialway_capacity" />
+                <reference ref="aerialway_duration" />
             </optional>
         </item>
         <item name="Platter Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
@@ -2281,8 +2367,8 @@
             <key key="aerialway" value="platter" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
+                <reference ref="aerialway_capacity" />
+                <reference ref="aerialway_duration" />
             </optional>
         </item>
         <item name="Rope Tow" type="way" preset_name_label="true">
@@ -2291,8 +2377,8 @@
             <key key="aerialway" value="rope_tow" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
+                <reference ref="aerialway_capacity" />
+                <reference ref="aerialway_duration" />
             </optional>
         </item>
         <item name="Magic Carpet" type="way" preset_name_label="true">
@@ -2301,8 +2387,8 @@
             <key key="aerialway" value="magic_carpet" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
+                <reference ref="aerialway_capacity" />
+                <reference ref="aerialway_duration" />
             </optional>
         </item>
         <item name="Goods" icon="presets/goods.png" type="way" preset_name_label="true">
@@ -2310,7 +2396,7 @@
             <key key="aerialway" value="goods" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
+                <reference ref="aerialway_duration" />
             </optional>
         </item>
         <separator/>
@@ -2318,13 +2404,13 @@
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
             <space />
             <key key="aerialway" value="station" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Pylon" icon="presets/power_tower.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
             <space />
             <key key="aerialway" value="pylon" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
     </group> <!-- Aerialway -->
     <separator/>
@@ -2365,7 +2451,7 @@
             <space />
             <key key="amenity" value="parking_space" />
             <reference ref="parking_name_type_ref" />
-            <text key="capacity" text="Capacity" />
+            <reference ref="capacity" />
             <reference ref="parking_access_fee_operator_surface" />
             <reference ref="stay" />
             <reference ref="supervised_lit_oh" />
@@ -2403,9 +2489,7 @@
             <key key="amenity" value="fuel" />
             <combo key="brand" text="Brand" values="Agip,Aral,Avia,BP,Chevron,Citgo,Esso,Exxon,Gulf,Mobil,OMV,Petro-Canada,Pioneer,Q8,Repsol,Shell,Sunoco,Statoil,Tamoil,Texaco,Total,Independent" values_searchable="true" />
             <optional>
-                <text key="name" text="Name" />
-                <text key="operator" text="Operator" />
-                <reference ref="oh" />
+                <reference ref="name_operator_oh" />
                 <combo key="shop" text="With shop" values="yes,convenience,kiosk,no" />
                 <label text="Fuel types:" />
                 <checkgroup columns="2">
@@ -2506,20 +2590,20 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=car_sharing" />
             <space />
             <key key="amenity" value="car_sharing" />
-            <text key="operator" text="Operator" />
-            <text key="capacity" text="Capacity" />
+            <reference ref="operator" />
+            <reference ref="capacity" />
             <reference ref="name_oh" />
-            <text key="website" text="Website" />
+            <reference ref="website" />
         </item>
     </group> <!-- Car -->
     <group name="Motorcycle" icon="presets/motorbike.png">
         <item name="Parking" icon="styles/standard/vehicle/parking/motorbike.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="amenity" value="motorcycle_parking" />
-            <text key="name" text="Name" />
-            <text key="capacity" text="Capacity" />
+            <reference ref="name" />
+            <reference ref="capacity" />
             <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
-            <combo key="fee" text="Fee" values="yes,no" />
+            <reference ref="fee" />
         </item>
         <item name="Motorcycle Dealer" icon="presets/motorbike.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"
@@ -2529,10 +2613,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=motorcycle" />
             <space />
             <key key="shop" value="motorcycle" />
-            <text key="name" text="Name" />
-            <combo key="brand" text="Brand" values="independent" />
-            <text key="operator" text="Operator" />
-            <reference ref="oh" />
+            <reference ref="name_brand_operator_oh" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
             <optional text="Services:">
                 <combo key="sale" text="Sale" values="yes,brand,no" />
@@ -2561,7 +2642,7 @@
             <space />
             <key key="amenity" value="bicycle_parking" />
             <reference ref="name_operator" />
-            <text key="capacity" text="Capacity" />
+            <reference ref="capacity" />
             <combo key="bicycle_parking" text="Type" values="anchors,building,ground_slots,informal,lockers,rack,shed,stands,wall_loops" />
             <check key="covered" text="Covered" />
             <check key="supervised" text="Supervised" />
@@ -2578,7 +2659,7 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:shop=bicycle" />
             <space />
             <key key="shop" value="bicycle" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <check key="service:bicycle:retail" text="Bicycles are sold" />
             <check key="service:bicycle:second_hand" text="Second-hand bicycles are sold" />
             <check key="service:bicycle:repair" text="Bicycles are repaired" />
@@ -2602,7 +2683,7 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=bicycle_rental" />
             <space />
             <key key="amenity" value="bicycle_rental" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <reference ref="link_contact" />
         </item>
     </group> <!-- Bicycle -->
@@ -2618,9 +2699,9 @@
                 <text key="from" text="From (initial stop)" />
                 <text key="to" text="To (terminal stop)" />
                 <text key="via" text="Via (intermediate stops)" />
-                <text key="operator" text="Operator" />
-                <text key="network" text="Network" />
-                <text key="description" text="Description" />
+                <reference ref="operator" />
+                <reference ref="network" />
+                <reference ref="description" />
                 <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
             </optional>
             <roles>
@@ -2640,8 +2721,8 @@
             <combo key="route_master" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" />
             <reference ref="name_ref" />
             <optional>
-                <text key="operator" text="Operator" />
-                <text key="network" text="Network" />
+                <reference ref="operator" />
+                <reference ref="network" />
                 <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
             </optional>
             <roles>
@@ -2653,13 +2734,13 @@
             <space />
             <key key="type" value="public_transport" />
             <key key="public_transport" value="stop_area" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional>
-                <text key="ref" text="Reference" />
+                <reference ref="ref" />
                 <text key="uic_ref" text="UIC reference" />
                 <text key="uic_name" text="UIC name" />
-                <text key="operator" text="Operator" />
-                <text key="network" text="Network" />
+                <reference ref="operator" />
+                <reference ref="network" />
             </optional>
             <roles>
                 <role key="stop" text="Stop Position" requisite="optional" type="node" member_expression="public_transport=stop_position" />
@@ -2672,13 +2753,13 @@
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_area" />
             <space />
             <key key="public_transport" value="stop_position" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional>
-                <text key="ref" text="Reference" />
+                <reference ref="ref" />
                 <text key="uic_ref" text="UIC reference" />
                 <text key="uic_name" text="UIC name" />
-                <text key="operator" text="Operator" />
-                <text key="network" text="Network" />
+                <reference ref="operator" />
+                <reference ref="network" />
             </optional>
             <check key="bus" text="Bus" />
             <check key="highway" value_on="bus_stop" value_off="" text="Bus stop (legacy)" />
@@ -2699,17 +2780,17 @@
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Platform" />
             <space />
             <key key="public_transport" value="platform" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <check key="bench" text="Bench" />
             <check key="shelter" text="Shelter" />
             <check key="covered" text="Covered" />
             <combo key="wheelchair" text="Wheelchair" values="yes,no,limited,only" />
             <optional>
-                <text key="ref" text="Reference" />
+                <reference ref="ref" />
                 <text key="uic_ref" text="UIC reference" />
                 <text key="uic_name" text="UIC name" />
-                <text key="operator" text="Operator" />
-                <text key="network" text="Network" />
+                <reference ref="operator" />
+                <reference ref="network" />
                 <space/>
                 <check key="bus" text="Bus" />
                 <check key="highway" value_on="platform" text="Highway platform (legacy)" />
@@ -2732,11 +2813,11 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:public_transport=station" />
             <space />
             <key key="public_transport" value="station" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <check key="area" text="Area" disable_off="true" />
             <check key="building" text="Building" disable_off="true" />
-            <text key="operator" text="Operator" />
-            <text key="network" text="Network" />
+            <reference ref="operator" />
+            <reference ref="network" />
         </item>
         <separator/>
         <item name="Subway Entrance" icon="presets/underground.png" type="node" preset_name_label="true">
@@ -2746,7 +2827,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=subway_entrance" />
             <key key="railway" value="subway_entrance" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <check key="wheelchair" text="Wheelchair" />
                 <check key="bicycle" text="Bicycle" />
             </optional>
@@ -2762,7 +2843,7 @@
             <key key="amenity" value="vending_machine" />
             <key key="vending" value="public_transport_tickets" />
             <reference ref="name_operator" />
-            <text key="ref" text="Reference Number" />
+            <reference ref="ref_number" />
             <reference ref="payment_account" />
         </item>
     </group>
@@ -2776,9 +2857,9 @@
                 <text key="from" text="From (initial stop)" />
                 <text key="to" text="To (terminal stop)" />
                 <text key="via" text="Via (intermediate stops)" />
-                <text key="operator" text="Operator" />
-                <text key="network" text="Network" />
-                <text key="description" text="Description" />
+                <reference ref="operator" />
+                <reference ref="network" />
+                <reference ref="description" />
                 <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
             </optional>
             <roles>
@@ -2801,7 +2882,7 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:railway=station" />
             <key key="railway" value="station" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <text key="uic_ref" text="UIC-Reference" />
             </optional>
         </item>
@@ -2812,7 +2893,7 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:railway=halt" />
             <key key="railway" value="halt" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
             </optional>
         </item>
         <item name="Tram Stop" icon="presets/tram.png" type="node" preset_name_label="true">
@@ -2821,7 +2902,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=tram_stop" />
             <key key="railway" value="tram_stop" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
             </optional>
         </item>
         <item name="Railway Platform" icon="presets/platform_rail.png" type="way,closedway" preset_name_label="true">
@@ -2831,7 +2912,7 @@
             <space />
             <key key="railway" value="platform" />
             <text key="ref" text="Reference (track number)" />
-            <text key="width" text="Width (meters)" />
+            <reference ref="width" />
             <check key="area" text="Area" />
         </item>
         <separator/>
@@ -2843,7 +2924,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bus_station" />
             <key key="amenity" value="bus_station" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
             </optional>
         </item>
         <item name="Bus Stop" icon="presets/bus_small.png" type="node" preset_name_label="true">
@@ -2858,7 +2939,7 @@
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:highway=bus_stop" />
             <key key="highway" value="bus_stop" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <combo key="shelter" text="Shelter" values="yes,no" />
                 <combo key="bench" text="Bench" values="yes,no" />
                 <combo key="tactile_paving" text="Tactile Paving" values="yes,no" />
@@ -2868,7 +2949,7 @@
             <space />
             <key key="highway" value="platform" />
             <text key="ref" text="Reference (track number)" />
-            <text key="width" text="Width (meters)" />
+            <reference ref="width" />
             <check key="area" text="Area" />
         </item>
     </group> <!-- Public Transport -->
@@ -2883,7 +2964,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=taxi" />
         <space />
         <key key="amenity" value="taxi" />
-        <text key="name" text="Name" />
+        <reference ref="name" />
     </item>
     <separator/>
     <group name="Airport" icon="presets/plane.png">
@@ -2893,11 +2974,11 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=aerodrome" />
             <space />
             <key key="aeroway" value="aerodrome" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional>
                 <text key="iata" text="IATA" />
                 <text key="icao" text="ICAO" />
-                <text key="wikipedia" text="Wikipedia" />
+                <reference ref="wikipedia" />
             </optional>
         </item>
         <separator/>
@@ -2909,7 +2990,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=runway" />
             <key key="aeroway" value="runway" />
             <optional>
-                <text key="ref" text="Reference" />
+                <reference ref="ref" />
             </optional>
         </item>
         <item name="Taxiway" icon="presets/taxiway.png" type="way" preset_name_label="true">
@@ -2919,7 +3000,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=taxiway" />
             <key key="aeroway" value="taxiway" />
             <optional>
-                <text key="ref" text="Reference" />
+                <reference ref="ref" />
             </optional>
         </item>
         <item name="Helipad" icon="styles/standard/transport/airport/helipad.png" type="node,closedway" preset_name_label="true">
@@ -2931,7 +3012,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=helipad" />
             <key key="aeroway" value="helipad" />
             <optional>
-                <text key="ref" text="Reference" />
+                <reference ref="ref" />
             </optional>
         </item>
         <item name="Apron" icon="presets/apron.png" type="closedway" preset_name_label="true">
@@ -2968,9 +3049,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=terminal" />
             <space />
             <key key="aeroway" value="terminal" />
-            <text key="name" text="Name" />
-            <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" />
+            <reference ref="name" />
+            <reference ref="internet" />
             <reference ref="link_contact" />
         </item>
         <item name="Gate" name_context="airport" icon="presets/aeroway_gate.png" type="node" preset_name_label="true">
@@ -2979,7 +3059,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=gate" />
             <space />
             <key key="aeroway" value="gate" />
-            <text key="ref" text="Reference" />
+            <reference ref="ref" />
         </item>
     </group> <!-- Aeroway -->
   </group>
@@ -2997,7 +3077,7 @@
             <space />
             <key key="tourism" value="hotel" />
             <reference ref="name_operator" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <reference ref="stars" />
             <space />
             <reference ref="internet_smoking_wheelchair" />
             <space />
@@ -3013,7 +3093,7 @@
             <space />
             <key key="tourism" value="motel" />
             <reference ref="name_operator" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <reference ref="stars" />
             <space />
             <reference ref="internet_smoking_wheelchair" />
             <space />
@@ -3028,7 +3108,7 @@
             <space />
             <key key="tourism" value="guest_house" />
             <reference ref="name_operator" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <reference ref="stars" />
             <space />
             <reference ref="internet_smoking_wheelchair" />
             <space />
@@ -3044,7 +3124,7 @@
             <space />
             <key key="tourism" value="chalet" />
             <reference ref="name_operator" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <reference ref="stars" />
             <space />
             <reference ref="internet_smoking_wheelchair" />
             <space />
@@ -3061,7 +3141,7 @@
             <space />
             <key key="tourism" value="hostel" />
             <reference ref="name_operator" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <reference ref="stars" />
             <space />
             <reference ref="internet_smoking_wheelchair" />
             <space />
@@ -3077,7 +3157,7 @@
             <space />
             <key key="tourism" value="alpine_hut" />
             <reference ref="name_operator" />
-            <text key="ele" text="Elevation" />
+            <reference ref="elevation" />
             <space />
             <reference ref="internet_smoking_wheelchair" />
             <space />
@@ -3092,11 +3172,11 @@
             <space />
             <key key="tourism" value="caravan_site" />
             <reference ref="name_operator" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <reference ref="stars" />
             <space />
             <reference ref="internet_smoking_wheelchair" />
             <space />
-            <text key="capacity" text="Number of places" />
+            <reference ref="capacity" />
             <combo key="fee" text="Requires a fee" values="yes,no,interval" />
             <check key="power_supply" text="Power supply" />
             <check key="tents" text="Tents allowed" />
@@ -3115,7 +3195,7 @@
             <space />
             <key key="tourism" value="camp_site" />
             <reference ref="name_operator" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <reference ref="stars" />
             <space />
             <reference ref="internet_smoking_wheelchair" />
             <space />
@@ -3137,7 +3217,7 @@
             <multiselect key="cuisine" text="Cuisine" values="italian;chinese;pizza;burger;greek;german;indian;regional;kebab;turkish;asian;thai;mexican;japanese;french;sandwich;sushi" values_searchable="true" />
             <check key="microbrewery" text="Microbrewery" />
             <reference ref="oh" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <reference ref="stars" />
             <space />
             <reference ref="internet_smoking_wheelchair" />
             <space />
@@ -3255,8 +3335,7 @@
             <key key="amenity" value="nightclub" />
             <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" />
+            <reference ref="smoking_wheelchair" />
             <space />
             <reference ref="contact" />
         </item>
@@ -3291,7 +3370,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=viewpoint" />
             <space />
             <key key="tourism" value="viewpoint" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
 <!--<check key="man_made" value="tower" text="Look-Out Tower" />-->
         </item>
         <separator/>
@@ -3306,8 +3385,7 @@
             <key key="tourism" value="information" />
             <key key="information" value="office" />
             <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" />
+            <reference ref="internet" />
             <reference ref="link_contact" />
         </item>
         <item name="Map" icon="presets/map.png" type="node" preset_name_label="true">
@@ -3315,10 +3393,10 @@
             <space />
             <key key="tourism" value="information" />
             <key key="information" value="map" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="map_type" text="Detail Grade" values="topo,street,scheme,toposcope" />
             <combo key="map_size" text="Shown Area" values="site,city,region" />
-            <text key="description" text="Closer Description" />
+            <reference ref="closer_description" />
             <optional text="Routes shown for:">
                 <check key="hiking" text="Hiking" />
                 <check key="bicycle" text="Cycling" />
@@ -3336,9 +3414,9 @@
             <space />
             <key key="tourism" value="information" />
             <key key="information" value="board" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="board_type" text="Board Content" values="notice,history,nature,wildlife,plants" />
-            <text key="description" text="Closer Description" />
+            <reference ref="closer_description" />
         </item>
         <item name="Guidepost" icon="presets/guidepost.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:information=guidepost"
@@ -3348,8 +3426,8 @@
             <space />
             <key key="tourism" value="information" />
             <key key="information" value="guidepost" />
-            <text key="name" text="Name" />
-            <text key="ele" text="Elevation" />
+            <reference ref="name" />
+            <reference ref="elevation" />
             <optional text="Routes shown for:">
                 <check key="hiking" text="Hiking" />
                 <check key="bicycle" text="Cycling" />
@@ -3365,24 +3443,21 @@
             <space />
             <key key="tourism" value="information" />
             <key key="information" value="terminal" />
-            <text key="name" text="Name" />
-            <text key="description" text="Closer description" />
-            <text key="operator" text="Operator" />
-            <text key="ref" text="Reference number" />
-            <combo key="fee" text="Fee" values="yes,no" />
-            <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" />
+            <reference ref="name_operator" />
+            <reference ref="closer_description" />
+            <reference ref="ref_number" />
+            <reference ref="fee" />
+            <reference ref="internet" />
         </item>
         <item name="Audioguide" icon="presets/information.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
             <space />
             <key key="tourism" value="information" />
             <key key="information" value="audioguide" />
-            <text key="name" text="Name" />
-            <text key="description" text="Closer description" />
-            <text key="operator" text="Operator" />
-            <text key="ref" text="Reference number" />
-            <combo key="fee" text="Fee" values="yes,no" />
+            <reference ref="name_operator" />
+            <reference ref="closer_description" />
+            <reference ref="ref_number" />
+            <reference ref="fee" />
             <space />
             <label text="Audioguide via mobile phone?" />
             <text key="phone" text="Phone number" />
@@ -3397,8 +3472,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=information" />
             <space />
             <key key="tourism" value="information" />
-            <text key="name" text="Name" />
-            <text key="description" text="Closer Description" />
+            <reference ref="name" />
+            <reference ref="closer_description" />
         </item>
     </group> <!-- Tourism -->
     <group name="Leisure" icon="presets/theme_park.png">
@@ -3424,7 +3499,7 @@
             <space />
             <key key="tourism" value="zoo" />
             <reference ref="name_oh" />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="wikipedia" />
             <space />
             <reference ref="contact" />
         </item>
@@ -3440,11 +3515,11 @@
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:leisure=dog_park" />
             <space />
             <key key="leisure" value="dog_park" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <check key="area" text="Area" />
             <combo key="barrier" text="Barrier" values="fence,wall" />
             <reference ref="oh" />
-            <check key="lit" text="Lit" />
+            <reference ref="lit_yesno" />
         </item>
         <item name="Theme Park" icon="presets/theme_park.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=theme_park"
@@ -3478,9 +3553,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=sauna" />
             <space />
             <key key="leisure" value="sauna" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <reference ref="oh" />
+            <reference ref="name_operator_oh" />
             <combo key="access" text="Access" values="yes,permissive,private,unknown" />
             <space />
             <reference ref="contact" />
@@ -3506,8 +3579,7 @@
             <key key="amenity" value="brothel" />
             <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" />
+            <reference ref="smoking_wheelchair" />
             <space />
             <reference ref="contact" />
         </item>
@@ -3525,12 +3597,12 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:leisure=playground" />
             <space />
             <key key="leisure" value="playground" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Picnic Site" icon="presets/picnic.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="tourism" value="picnic_site" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <check key="fireplace" text="Fireplace" />
         </item>
         <item name="Public Grill" icon="presets/bbq.png" type="node" preset_name_label="true">
@@ -3541,7 +3613,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bbq" />
             <space />
             <key key="amenity" value="bbq" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="fuel" text="Fuel" text_context="grill" values="charcoal,electric,wood" />
             <check key="covered" text="Covered" />
         </item>
@@ -3552,7 +3624,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=fishing" />
             <space />
             <key key="leisure" value="fishing" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Private Swimming Pool" icon="presets/swimming.png" type="node,closedway" preset_name_label="true">
             <key key="leisure" value="swimming_pool" />
@@ -3570,7 +3642,7 @@
             <space />
             <key key="tourism" value="museum" />
             <reference ref="name_operator_oh" />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="wikipedia" />
             <reference ref="link_contact" />
         </item>
         <item name="Theatre" icon="presets/theater.png" type="node,closedway,relation" preset_name_label="true">
@@ -3607,7 +3679,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=arts_centre" />
             <space />
             <key key="amenity" value="arts_centre" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <reference ref="link_contact" />
         </item>
         <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway" preset_name_label="true">
@@ -3622,7 +3694,7 @@
             <space />
             <key key="tourism" value="artwork" />
             <combo key="artwork_type" text="Type" values="mural,sculpture,statue" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <text key="artist_name" text="Artist Name" />
         </item>
         <item name="Recording Studio" icon="presets/studio.png" type="node,closedway,relation" preset_name_label="true">
@@ -3655,7 +3727,7 @@
             <space />
             <key key="amenity" value="place_of_worship" />
             <key key="religion" value="christian" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="building" text="Building type" values="basilica,cathedral,chapel,church,temple" values_searchable="true" />
             <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,greek_catholic,greek_orthodox,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,orthodox,pentecostal,presbyterian,protestant,quaker,roman_catholic,russian_orthodox,seventh_day_adventist" values_context="christian" values_searchable="true" />
             <reference ref="service_times" />
@@ -3678,7 +3750,7 @@
             <space />
             <key key="amenity" value="place_of_worship" />
             <key key="religion" value="muslim" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="building" text="Building type" values="mosque" values_searchable="true" />
             <combo key="denomination" text="Denomination" values="ibadi,shia,sunni" values_searchable="true" />
             <reference ref="service_times" />
@@ -3701,7 +3773,7 @@
             <space />
             <key key="amenity" value="place_of_worship" />
             <key key="religion" value="jewish" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="building" text="Building type" values="synagogue" values_searchable="true" />
             <combo key="denomination" text="Denomination" values="orthodox,conservative,reform" values_context="jewish" values_searchable="true" />
             <reference ref="service_times" />
@@ -3724,7 +3796,7 @@
             <space />
             <key key="amenity" value="place_of_worship" />
             <key key="religion" value="buddhist" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="denomination" text="Denomination" values="theravada,mahayana,vajrayana" values_searchable="true" />
             <reference ref="service_times" />
             <reference ref="oh" />
@@ -3746,7 +3818,7 @@
             <space />
             <key key="amenity" value="place_of_worship" />
             <key key="religion" value="hindu" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
             <reference ref="service_times" />
             <reference ref="oh" />
@@ -3768,7 +3840,7 @@
             <space />
             <key key="amenity" value="place_of_worship" />
             <key key="religion" value="shinto" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <reference ref="service_times" />
             <reference ref="oh" />
         </item>
@@ -3788,7 +3860,7 @@
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
             <space />
             <key key="amenity" value="place_of_worship" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="religion" text="Religion" values="bahai,jain,sikh,spiritualist,taoist,unitarian,zoroastrian" match="keyvalue" values_searchable="true" />
             <reference ref="service_times" />
             <reference ref="oh" />
@@ -3802,7 +3874,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=public_building" />
             <space />
             <key key="amenity" value="public_building" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Town hall" icon="presets/townhall.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall"
@@ -3814,7 +3886,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=townhall" />
             <space />
             <key key="amenity" value="townhall" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <reference ref="link_contact" />
         </item>
         <item name="Community Centre" icon="presets/community_centre.png" type="node,closedway" preset_name_label="true">
@@ -3839,7 +3911,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=embassy" />
             <space />
             <key key="amenity" value="embassy" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <reference ref="link_contact" />
         </item>
         <item name="Courthouse" icon="presets/JusticeScales.png" type="node,closedway,relation" preset_name_label="true">
@@ -3851,7 +3923,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=courthouse" />
             <space />
             <key key="amenity" value="courthouse" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <reference ref="link_contact" />
         </item>
         <item name="Prison" icon="presets/prison.png" type="node,closedway,relation" preset_name_label="true">
@@ -3863,7 +3935,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=prison" />
             <space />
             <key key="amenity" value="prison" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <reference ref="link_contact" />
         </item>
         <item name="Police" icon="styles/standard/service/police.png" type="node,closedway,relation" preset_name_label="true">
@@ -3877,7 +3949,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=police" />
             <space />
             <key key="amenity" value="police" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <reference ref="link_contact" />
         </item>
         <item name="Fire Station" icon="presets/firebrigade.png" type="node,closedway,relation" preset_name_label="true">
@@ -3891,7 +3963,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fire_station" />
             <space />
             <key key="amenity" value="fire_station" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Post Office" icon="styles/standard/service/post_office.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office"
@@ -3912,7 +3984,7 @@
         <item name="Kindergarten" icon="presets/kindergarten.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="amenity" value="kindergarten" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <reference ref="link_contact" />
         </item>
         <item name="School" icon="presets/school.png" type="node,closedway,relation" preset_name_label="true">
@@ -3928,7 +4000,7 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=school" />
             <space />
             <key key="amenity" value="school" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <reference ref="link_contact" />
         </item>
         <item name="University" icon="styles/standard/education/university.png" type="node,closedway,relation" preset_name_label="true">
@@ -3943,7 +4015,7 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=university" />
             <space />
             <key key="amenity" value="university" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <reference ref="link_contact" />
         </item>
         <item name="College" icon="styles/standard/education/college.png" type="node,closedway,relation" preset_name_label="true">
@@ -3955,7 +4027,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=college" />
             <space />
             <key key="amenity" value="college" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <reference ref="link_contact" />
         </item>
          <item name="Driving School" icon="styles/standard/education/driving_school.png" type="node,closedway" preset_name_label="true">
@@ -3987,7 +4059,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=clinic" />
             <space />
             <key key="amenity" value="clinic" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <reference ref="link_contact" />
         </item>
         <item name="Doctors" icon="styles/standard/health/doctor.png" type="node,closedway" preset_name_label="true">
@@ -4024,7 +4096,7 @@
             <key key="social_facility" value="group_home" />
             <key key="social_facility:for" value="senior" />
             <reference ref="name_operator" />
-            <text key="capacity" text="Capacity" />
+            <reference ref="capacity" />
             <reference ref="link_contact" />
         </item>
         <separator/>
@@ -4039,7 +4111,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=pharmacy" />
             <space />
             <key key="amenity" value="pharmacy" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="dispensing" text="Dispensing" values="yes,no" default="no" />
             <reference ref="oh" />
             <reference ref="link_contact" />
@@ -4067,7 +4139,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=baby_hatch" />
             <space />
             <key key="amenity" value="baby_hatch" />
-            <text key="operator" text="Operator" />
+            <reference ref="operator" />
             <reference ref="oh" />
         </item>
         <separator/>
@@ -4081,7 +4153,7 @@
             <key key="highway" value="emergency_access_point" />
             <text key="ref" text="Point Number" />
             <text key="name" text="Point Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="operator" />
             <text key="phone" text="Phone Number" />
             <label text="(Use international code, like +12-345-67890)" />
             <space />
@@ -4119,9 +4191,9 @@
             <combo key="drinking_water" text="Drinking Water" values="yes,no,seasonal" />
             <combo key="toilets:disposal" text="Type" values="flush,pitlatrine,chemical,bucket" />
             <optional>
-                <text key="description" text="Description" />
-                <combo key="fee" text="Fee" values="yes,no" />
-                <text key="operator" text="Operator" />
+                <reference ref="description" />
+                <reference ref="fee" />
+                <reference ref="operator" />
                 <combo key="toilets:position" text="Usage Position" values="seated,seated;urinal,squat,urinal" />
                 <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" />
             </optional>
@@ -4135,8 +4207,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=post_box" />
             <space />
             <key key="amenity" value="post_box" />
-            <text key="operator" text="Operator" />
-            <text key="ref" text="Reference number" />
+            <reference ref="operator" />
+            <reference ref="ref_number" />
             <combo key="collection_times" text="Collection times" delimiter="|" values="11:30|Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00|Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off" />
             <check key="drive_through" text="Drive through" />
         </item>
@@ -4150,7 +4222,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=telephone" />
             <space />
             <key key="amenity" value="telephone" />
-            <text key="operator" text="Operator" />
+            <reference ref="operator" />
             <reference ref="payment_base" />
             <check key="payment:telephone_cards" text="Telephone cards" />
         </item>
@@ -4181,7 +4253,7 @@
             <space />
             <key key="emergency" value="defibrillator" />
             <reference ref="oh" />
-            <text  key="operator" text="Operator" />
+            <reference ref="operator" />
             <check key="indoor" text="Located inside a building?" />
             <!-- lastcheck is in use for aed devices, but not yet well discussed or documented
             <optional>
@@ -4273,7 +4345,7 @@
         <item name="Shelter" icon="presets/shelter.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="amenity" value="shelter" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <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>
@@ -4299,8 +4371,8 @@
             <key key="amenity" value="drinking_water" />
             <check key="indoor" text="Indoor" />
             <optional>
-                <text key="name" text="Name" />
-                <text key="description" text="Description" />
+                <reference ref="name" />
+                <reference ref="description" />
             </optional>
         </item>
         <item name="Fire Hydrant" icon="presets/fire_hydrant.png" type="node" preset_name_label="true">
@@ -4318,7 +4390,7 @@
             <combo key="fire_hydrant:diameter" text="Diameter (in mm)" values="50,80,100,150,200,250,300,400" />
             <space />
             <reference ref="name_ref" />
-            <text key="operator" text="Operator" />
+            <reference ref="operator" />
             <space />
             <combo key="fire_hydrant:position" text="Hydrant Position" values="lane,parking_lot,sidewalk,green" values_context="hydrant position" />
             <combo key="fire_hydrant:pressure" text="Pressure (in bar)" values="5,6,8,suction" />
@@ -4331,33 +4403,33 @@
         <item name="Stadium" icon="presets/stadium.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="leisure" value="stadium" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional text="Select sport:">
-                <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
+                <reference ref="sport" />
             </optional>
         </item>
         <item name="Sports Centre" icon="presets/sports_centre.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="leisure" value="sports_centre" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional text="Select sport:">
-                <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
+                <reference ref="sport" />
             </optional>
         </item>
         <item name="Pitch" icon="presets/pitch.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="leisure" value="pitch" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional text="Select sport:">
-                <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
+                <reference ref="sport" />
             </optional>
         </item>
         <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway,relation" preset_name_label="true">
             <space />
             <key key="leisure" value="track" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional text="Select sport:">
-                <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
+                <reference ref="sport" />
             </optional>
         </item>
         <item name="Golf Course" icon="presets/golf.png" type="node,closedway" preset_name_label="true">
@@ -4376,7 +4448,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=multi" />
             <space />
             <key key="sport" value="multi" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" />
         </item>
         <item name="9pin" icon="styles/standard/sport/10pin.png" type="node,closedway" preset_name_label="true">
@@ -4384,29 +4456,29 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=9pin" />
             <space />
             <key key="sport" value="9pin" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <reference ref="name" />
+            <reference ref="name_leisure_type" />
         </item>
         <item name="10pin" icon="styles/standard/sport/10pin.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=10pin" />
             <space />
             <key key="sport" value="10pin" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <reference ref="name" />
+            <reference ref="name_leisure_type" />
         </item>
         <item name="Archery" icon="styles/standard/sport/archery.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=archery"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:sport=archery" />
             <space />
             <key key="sport" value="archery" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <reference ref="name" />
+            <reference ref="name_leisure_type" />
         </item>
         <item name="Athletics" icon="presets/athletics.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sports=athletics" />
             <space />
             <key key="sport" value="athletics" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" default="track" />
         </item>
         <item name="Climbing" icon="styles/standard/sport/climbing.png" type="node,way,closedway" preset_name_label="true">
@@ -4415,58 +4487,56 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:sport=climbing" />
             <space />
             <key key="sport" value="climbing" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="leisure" text="Type" values="sports_centre" />
         </item>
         <item name="Canoeing" icon="presets/canoe.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canoe" />
             <space />
             <key key="sport" value="canoe" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Cycling" icon="presets/cycling.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cycling" />
             <space />
             <key key="sport" value="cycling" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
         </item>
         <item name="Dog Racing" icon="styles/standard/leisure/dog.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=dog_racing" />
             <space />
             <key key="sport" value="dog_racing" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
         </item>
         <item name="Equestrian" icon="presets/equestrian.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=equestrian" />
             <space />
             <key key="sport" value="equestrian" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="riding" />
-            <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
+            <reference ref="name" />
+            <reference ref="riding_surface" />
         </item>
         <item name="Horse Racing" icon="presets/equestrian.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=horse_racing" />
             <space />
             <key key="sport" value="horse_racing" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="riding" />
-            <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
+            <reference ref="name" />
+            <reference ref="riding_surface" />
         </item>
         <item name="Gymnastics" icon="presets/gymnastics.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gymnastics" />
             <space />
             <key key="sport" value="gymnastics" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <reference ref="name" />
+            <reference ref="name_leisure_type" />
         </item>
         <item name="Skating" icon="presets/skating.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skating"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=skating" />
             <space />
             <key key="sport" value="skating" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" default="ice_rink" />
         </item>
         <item name="Skateboard" icon="styles/standard/sport/skateboard.png" type="node,closedway" preset_name_label="true">
@@ -4474,7 +4544,7 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=skateboard" />
             <space />
             <key key="sport" value="skateboard" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" default="pitch" values_context="racing" />
         </item>
         <item name="Swimming" icon="presets/swimming.png" type="node,closedway" preset_name_label="true">
@@ -4482,14 +4552,14 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=swimming" />
             <space />
             <key key="sport" value="swimming" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="leisure" text="Type" values="sports_centre,stadium,swimming_pool,water_park" default="swimming_pool" values_searchable="true" />
         </item>
         <item name="Skiing" icon="presets/skiing_downhill.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
             <space />
             <key key="sport" value="skiing" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,snow_park" />
             <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" values_context="piste:difficulty" values_searchable="true" />
             <combo key="piste:grooming" text="Grooming" values="classic,mogul,skating,classic;skating,scooter,backcountry" values_context="piste:grooming" />
@@ -4502,8 +4572,8 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=shooting" />
             <space />
             <key key="sport" value="shooting" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <reference ref="name" />
+            <reference ref="name_leisure_type" />
         </item>
     </group> <!-- Sport -->
     <group name="Sport (Ball)" icon="presets/soccer.png">
@@ -4593,7 +4663,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:sport=golf" />
             <space />
             <key key="sport" value="golf" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="leisure" text="Type" values="golf_course,pitch,sports_centre,stadium" default="golf_course" />
         </item>
         <item name="Boule" icon="presets/boule.png" type="node,closedway" preset_name_label="true">
@@ -4618,8 +4688,8 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket_nets" />
             <space />
             <key key="sport" value="cricket_nets" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <reference ref="name" />
+            <reference ref="name_leisure_type" />
         </item>
         <item name="Croquet" icon="styles/standard/sport/croquet.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=croquet" />
@@ -4631,7 +4701,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=hockey" />
             <space />
             <key key="sport" value="hockey" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" />
         </item>
         <item name="Pelota" icon="presets/pelota.png" type="node,closedway" preset_name_label="true">
@@ -4646,15 +4716,15 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=racquet" />
             <space />
             <key key="sport" value="racquet" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <reference ref="name" />
+            <reference ref="name_leisure_type" />
         </item>
         <item name="Table Tennis" icon="presets/table_tennis.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=table_tennis" />
             <space />
             <key key="sport" value="table_tennis" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <reference ref="name" />
+            <reference ref="name_leisure_type" />
         </item>
         <item name="Tennis" icon="presets/tennis.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=tennis" />
@@ -4667,38 +4737,38 @@
         <item name="Motorsport" icon="styles/standard/sport/motor.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="sport" value="motor" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
         </item>
         <item name="Karting" icon="presets/karting.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="sport" value="karting" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
         </item>
         <item name="Motocross" icon="styles/standard/sport/motocross.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="sport" value="motocross" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
         </item>
         <item name="Safety Training" icon="presets/safety_training.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="sport" value="safety_training" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
         </item>
         <separator/>
         <item name="Model Aerodrome" icon="presets/plane.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="sport" value="model_aerodrome" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="aerialway" />
         </item>
         <item name="RC Car" icon="presets/car.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="sport" value="rc_car" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
         </item>
         <item name="Raceway" type="closedway" preset_name_label="true">
@@ -4709,7 +4779,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=raceway" />
             <space />
             <key key="highway" value="raceway" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
     </group> <!-- Motorsport -->
   </group> <!-- Sports -->
@@ -4731,7 +4801,7 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:building" />
             <space />
             <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,farm,transportation,greenhouse,office,university,hospital,warehouse,retail,shed,construction" values_context="building" default="yes" match="keyvalue" values_searchable="true" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Residential Building" icon="styles/standard/misc/landmark/building.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:building"
@@ -4745,7 +4815,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:building" />
             <space />
             <combo key="building" text="Building" values="residential,apartments,house,hut,dormitory,terrace,detached,roof" default="residential" match="keyvalue" values_context="building" values_searchable="true" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Entrance" icon="styles/standard/misc/entrance-yes.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:entrance"
@@ -4766,11 +4836,11 @@
         <item name="Tower" icon="presets/tower.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="man_made" value="tower" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="tower:type" text="Tower type" values="communication,observation" />
             <optional>
-                <text key="height" text="Height (meters)" />
-                <text key="operator" text="Operator" />
+                <reference ref="height" />
+                <reference ref="operator" />
             </optional>
         </item>
         <item name="Flagpole" icon="presets/flag.png" type="node" preset_name_label="true">
@@ -4783,14 +4853,14 @@
         <item name="Works" icon="presets/works.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="man_made" value="works" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Chimney" icon="presets/chimney.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Chimney" />
             <space />
             <key key="man_made" value="chimney" />
             <reference ref="name_operator" />
-            <text key="height" text="Height (meters)" />
+            <reference ref="height" />
         </item>
         <item name="Windmill" icon="presets/windmill.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill"
@@ -4801,12 +4871,12 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=windmill" />
             <space />
             <key key="man_made" value="windmill" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Gasometer" icon="presets/gasometer.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="man_made" value="gasometer" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Pipeline" icon="presets/path.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
@@ -4815,7 +4885,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=pipeline" />
             <space />
             <key key="man_made" value="pipeline" />
-            <text key="operator" text="Operator" />
+            <reference ref="operator" />
             <combo key="type" text="Type" values="water,gas,heat,oil,sewage" />
             <combo key="location" text="Location" values="underground,underwater,overground" values_context="pipeline" />
         </item>
@@ -4827,7 +4897,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=crane" />
             <space />
             <key key="man_made" value="crane" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Mineshaft" icon="presets/mineshaft.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=mineshaft"
@@ -4837,10 +4907,10 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=mineshaft" />
             <space />
             <key key="man_made" value="mineshaft" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="mineshaft_type" text="Function" values="winding,air" />
             <text key="depth" text="Depth in meters" />
-            <text key="operator" text="Operator" />
+            <reference ref="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" />
@@ -4855,9 +4925,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=adit" />
             <space />
             <key key="man_made" value="adit" />
-            <text key="name" text="Name" />
-            <text key="length" text="Length in meters" />
-            <text key="operator" text="Operator" />
+            <reference ref="name" />
+            <reference ref="length" />
+            <reference ref="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" />
         </item>
@@ -4865,7 +4935,7 @@
         <item name="Water Tower" icon="presets/water_tower.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="man_made" value="water_tower" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Water Works" icon="presets/water_works.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_works"
@@ -4887,7 +4957,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=wastewater_plant" />
             <space />
             <key key="man_made" value="wastewater_plant" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Watermill" icon="styles/standard/misc/landmark/watermill.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=watermill"
@@ -4898,7 +4968,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=watermill" />
             <space />
             <key key="man_made" value="watermill" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Fountain" icon="presets/spring.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
@@ -4912,7 +4982,7 @@
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=fountain" />
             <space />
             <key key="amenity" value="fountain" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Water Well" icon="presets/water_well.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_well"
@@ -4924,7 +4994,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=water_well" />
             <space />
             <key key="man_made" value="water_well" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <separator/>
         <item name="Lighthouse" icon="styles/standard/misc/landmark/lighthouse.png" type="node,closedway" preset_name_label="true">
@@ -4935,7 +5005,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=lighthouse" />
             <space />
             <key key="man_made" value="lighthouse" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
@@ -4943,7 +5013,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=beacon" />
             <space />
             <key key="man_made" value="beacon" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Street Lamp" icon="styles/standard/misc/streetlamp.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=street_lamp"
@@ -4995,7 +5065,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=survey_point" />
             <space />
             <key key="man_made" value="survey_point" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Surveillance Camera" icon="presets/surveillance.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance"
@@ -5009,10 +5079,9 @@
             <key key="surveillance:type" value="camera" />
             <combo key="surveillance" text="Type" values="indoor,outdoor,public" />
             <combo key="surveillance:zone" text="Zone" values="town,parking,traffic,shop,bank,building" />
-            <text key="operator" text="Operator" />
+            <reference ref="operator" />
             <optional>
-                <text key="name" text="Name" />
-                <text key="ref" text="Reference" />
+                <reference ref="name_ref" />
             </optional>
             <space />
             <label text="Camera" />
@@ -5022,7 +5091,7 @@
             <optional>
                 <text key="camera:direction" text="Direction in degrees" match="key" />
                 <text key="camera:angle" text="Inclination in degrees" match="key" />
-                <text key="height" text="Height in meter (m)" />
+                <reference ref="height" />
             </optional>
         </item>
     </group> <!-- Man Made -->
@@ -5217,7 +5286,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=substation" />
             <space />
             <key key="power" value="substation" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="substation" text="Type of substation" values="transmission,distribution,minor_distribution,converter,compensation,transition,traction,industrial" values_context="power" />
             <reference ref="power_extra" />
             <optional>
@@ -5340,7 +5409,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=tower" />
             <space />
             <key key="power" value="tower" />
-            <text key="height" text="Height in meter (m)" />
+            <reference ref="height" />
             <combo key="structure" text="Type of construction" values="lattice,tubular,solid " />
             <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
             <combo key="colour" text="Color (HTML name or hexadecimal code)" values="black,red,white,gray,red/white" values_context="color" />
@@ -5364,7 +5433,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=pole" />
             <space />
             <key key="power" value="pole" />
-            <text key="height" text="Height in meter (m)" />
+            <reference ref="height" />
             <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
             <reference ref="ref_operator_branch" />
         </item>
@@ -5384,7 +5453,7 @@
             <optional>
                 <reference ref="cable_circuit" />
                 <combo key="wires" text="Number of conductors/wires per cable" values="single,double,triple,quad,fivefold,sixfold,eightfold" values_context="power" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+                <reference ref="layer" />
                 <check key="communication" text="Used for data communications" value_on="line" value_off="" default="off" />
             </optional>
         </item>
@@ -5399,7 +5468,7 @@
             <optional>
                 <reference ref="cable_circuit" />
                 <combo key="location" text="Location" values="underground,underwater,overground" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+                <reference ref="layer" />
                 <check key="communication" text="Used for data communications" value_on="line" value_off="" default="off" />
             </optional>
         </item>
@@ -5439,19 +5508,19 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=battlefield" />
             <space />
             <key key="historic" value="battlefield" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Palaeontological Site" icon="presets/palaeontological_site.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
             <space />
             <key key="geological" value="palaeontological_site" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <separator/>
         <item name="Monument" icon="presets/monument.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="historic" value="monument" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Memorial" icon="presets/memorial.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial"
@@ -5463,22 +5532,22 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:historic=memorial" />
             <space />
             <key key="historic" value="memorial" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Wayside Cross" icon="presets/wayside_cross.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="historic" value="wayside_cross" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Wayside Shrine" icon="presets/wayside_shrine.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="historic" value="wayside_shrine" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Boundary Stone" icon="styles/standard/historic/boundary_stone.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="historic" value="boundary_stone" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
     </group> <!-- Historic Places -->
   </group> <!-- Structures -->
@@ -5615,8 +5684,8 @@
             <space />
             <key key="amenity" value="marketplace" />
             <reference ref="name_operator_oh" />
-            <text key="website" text="Website" />
-            <combo key="organic" text="Organic" values="only,yes,no" />
+            <reference ref="website" />
+            <reference ref="organic" />
         </item>
         <item name="Greengrocer" icon="presets/greengrocer.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=greengrocer"
@@ -5627,7 +5696,7 @@
             <space />
             <key key="shop" value="greengrocer" />
             <reference ref="name_oh" />
-            <combo key="organic" text="Organic" values="only,yes,no" />
+            <reference ref="organic" />
             <reference ref="link_contact" />
         </item>
         <item name="Farm Stand" icon="presets/apple.png" type="node,closedway" preset_name_label="true">
@@ -5639,8 +5708,8 @@
             <space />
             <key key="shop" value="farm" />
             <reference ref="name_oh" />
-            <text key="description" text="Description" />
-            <combo key="organic" text="Organic" values="only,yes,no" />
+            <reference ref="description" />
+            <reference ref="organic" />
             <reference ref="link_contact" />
         </item>
         <separator/>
@@ -5693,7 +5762,7 @@
             <key key="shop" value="clothes" />
             <reference ref="name_oh" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
-            <combo key="organic" text="Organic" values="only,yes,no" />
+            <reference ref="organic" />
             <reference ref="link_contact" />
         </item>
         <item name="Boutique" icon="presets/boutique.png" type="node,closedway" preset_name_label="true">
@@ -5716,7 +5785,7 @@
             <key key="shop" value="shoes" />
             <reference ref="name_oh" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
-            <combo key="organic" text="Organic" values="only,yes,no" />
+            <reference ref="organic" />
             <reference ref="link_contact" />
         </item>
         <item name="Outdoor" icon="presets/tent.png" type="node,closedway" preset_name_label="true">
@@ -5891,7 +5960,7 @@
             <space />
             <key key="amenity" value="atm" />
             <text key="brand" text="Brand" />
-            <text key="operator" text="Operator" />
+            <reference ref="operator" />
             <reference ref="oh" />
         </item>
         <item name="Pawnbroker" icon="presets/pawnbroker.svg" type="node,closedway" preset_name_label="true">
@@ -5964,7 +6033,7 @@
         </item>
     </group> <!-- Home decoration -->
     <group name="Printed material" icon="presets/stationery.png">
-	        <item name="Stationery" icon="presets/stationery.png" type="node,closedway" preset_name_label="true">
+        <item name="Stationery" icon="presets/stationery.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=stationery"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=stationery"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=stationery"
@@ -6259,8 +6328,8 @@
         <space />
         <key key="amenity" value="vending_machine" />
         <multiselect key="vending" text="Vending products" values="animal_food;bicycle_tube;cigarettes;condoms;drinks;excrement_bags;food;news_papers;parking_tickets;photos;public_transport_plans;public_transport_tickets;SIM-cards;stamps;sweets;tampons;telephone_vouchers;toys;vouchers" values_searchable="true" />
-        <text key="operator" text="Operator" />
-        <text key="ref" text="Reference number" />
+        <reference ref="operator" />
+        <reference ref="ref_number" />
         <text key="note" text="Note" />
         <reference ref="payment_account" />
     </item>
@@ -6270,7 +6339,7 @@
         <item name="National" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
             <space />
             <key key="boundary" value="national" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Administrative" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative"
@@ -6282,7 +6351,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:boundary=administrative" />
             <space />
             <key key="boundary" value="administrative" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Political" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=political"
@@ -6290,7 +6359,7 @@
             <space />
             <key key="boundary" value="political" />
             <combo key="political_division" text="Division" values="canton,linguistic_community,ward" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Postal Code" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=postal_code" />
@@ -6305,7 +6374,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:boundary=national_park" />
             <space />
             <key key="boundary" value="national_park" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
     </group> <!-- Boundaries -->
     <group name="Places" icon="presets/places.png">
@@ -6396,7 +6465,7 @@
             <key key="place" value="neighbourhood" />
             <reference ref="name_wikipedia" />
             <text key="population" text="Population" />
-            <text key="website" text="Website" />
+            <reference ref="website" />
         </item>
         <separator/>
         <item name="Locality" icon="presets/locality.png" type="node,closedway" preset_name_label="true">
@@ -6420,8 +6489,7 @@
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:natural=peak" />
             <space />
             <key key="natural" value="peak" />
-            <reference ref="name_wikipedia" />
-            <text key="ele" text="Elevation" />
+            <reference ref="name_wikipedia_elevation" />
         </item>
         <item name="Saddle" icon="presets/saddle.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=saddle"
@@ -6430,8 +6498,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=saddle" />
             <space/>
             <key key="natural" value="saddle" />
-            <reference ref="name_wikipedia" />
-            <text key="ele" text="Elevation" />
+            <reference ref="name_wikipedia_elevation" />
         </item>
         <item name="Glacier" icon="presets/glacier.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier"
@@ -6440,8 +6507,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=glacier" />
             <space />
             <key key="natural" value="glacier" />
-            <reference ref="name_wikipedia" />
-            <text key="ele" text="Elevation" />
+            <reference ref="name_wikipedia_elevation" />
         </item>
         <item name="Volcano" icon="presets/volcano.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano"
@@ -6451,8 +6517,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=volcano" />
             <space />
             <key key="natural" value="volcano" />
-            <reference ref="name_wikipedia" />
-            <text key="ele" text="Elevation" />
+            <reference ref="name_wikipedia_elevation" />
         </item>
         <item name="Cave Entrance" icon="presets/cave_entrance.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance"
@@ -6497,13 +6562,11 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=tree" />
             <space />
             <key key="natural" value="tree" />
-            <text key="name" text="Name" />
-            <text key="height" text="Height in meter (m)" />
+            <reference ref="name" />
+            <reference ref="height" />
             <text key="name:botanical" text="Botanical Name" />
             <optional>
-                <text key="genus" text="Genus" />
-                <text key="species" text="Species" />
-                <text key="taxon" text="Taxon" />
+                <reference ref="genus_species_taxon" />
                 <reference ref="leaf" />
             </optional>
         </item>
@@ -6530,7 +6593,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=wood" />
             <space />
             <key key="natural" value="wood" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <reference ref="leaf" />
         </item>
         <item name="Forest" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
@@ -6543,7 +6606,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=forest" />
             <space />
             <key key="landuse" value="forest" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <reference ref="leaf" />
         </item>
         <item name="Grassland" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
@@ -6557,19 +6620,19 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:natural=grassland" />
             <space />
             <key key="natural" value="grassland" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="grassland" text="Type" values="pampas,prairie,puszta,savanna,steppe,veld" />
         </item>
         <item name="Nature Reserve" icon="styles/standard/leisure/nature_reserve.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="leisure" value="nature_reserve" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <separator/>
         <item name="Scree" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="natural" value="scree" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Fell" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell"
@@ -6579,12 +6642,12 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=fell" />
             <space />
             <key key="natural" value="fell" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Scrub" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="natural" value="scrub" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Heath" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath"
@@ -6595,7 +6658,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=heath" />
             <space />
             <key key="natural" value="heath" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Sand" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=sand"
@@ -6603,7 +6666,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=sand" />
             <space />
             <key key="natural" value="sand" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
     </group> <!-- Nature -->
     <group name="Land use" icon="presets/landuse.png">
@@ -6616,17 +6679,17 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=farmyard" />
             <space />
             <key key="landuse" value="farmyard" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Farmland" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
             <space />
             <key key="landuse" value="farmland" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Meadow" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="landuse" value="meadow" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Orchard" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=orchard"
@@ -6637,12 +6700,12 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=orchard" />
             <space />
             <key key="landuse" value="orchard" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Vineyard" icon="presets/fruits.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="landuse" value="vineyard" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Greenhouse Horticulture" icon="presets/greenhouse_horticulture.png" type="closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=greenhouse_horticulture"
@@ -6652,8 +6715,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=greenhouse_horticulture" />
             <space />
             <key key="landuse" value="greenhouse_horticulture" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
         </item>
         <item name="Plant Nursery" icon="styles/standard/misc/landmark/plant.png" type="closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=plant_nursery"
@@ -6664,26 +6726,24 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=plant_nursery" />
             <space />
             <key key="landuse" value="plant_nursery" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <text key="genus" text="Genus" />
-            <text key="species" text="Species" />
+            <reference ref="name_operator" />
+            <reference ref="genus_species" />
         </item>
         <item name="Allotments" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="landuse" value="allotments" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <separator/>
         <item name="Garden" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="leisure" value="garden" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Grass" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="landuse" value="grass" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Village Green" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green"
@@ -6695,7 +6755,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=village_green" />
             <space />
             <key key="landuse" value="village_green" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Common" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common"
@@ -6703,12 +6763,12 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:leisure=common" />
             <space />
             <key key="leisure" value="common" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Park" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="leisure" value="park" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Recreation Ground" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground"
@@ -6719,13 +6779,13 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=recreation_ground" />
             <space />
             <key key="landuse" value="recreation_ground" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <separator/>
         <item name="Residential Area" icon="styles/standard/misc/landmark/building.png" type="closedway,relation" preset_name_label="true">
             <space />
             <key key="landuse" value="residential" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Graveyard" icon="presets/graveyard.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard"
@@ -6773,7 +6833,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=retail" />
             <space />
             <key key="landuse" value="retail" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Commercial" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=commercial"
@@ -6784,7 +6844,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=commercial" />
             <space />
             <key key="landuse" value="commercial" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Industrial" icon="presets/works.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=industrial"
@@ -6796,7 +6856,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=industrial" />
             <space />
             <key key="landuse" value="industrial" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Garages" icon="presets/garages.png" type="closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=garages"
@@ -6807,8 +6867,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=garages" />
             <space />
             <key key="landuse" value="garages" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
         </item>
         <item name="Railway land" icon="presets/rail_light.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway"
@@ -6819,7 +6878,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=railway" />
             <space />
             <key key="landuse" value="railway" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Military" icon="presets/military.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=military"
@@ -6829,7 +6888,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=military" />
             <space />
             <key key="landuse" value="military" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <separator/>
         <item name="Construction area" icon="presets/construction.png" type="node,closedway,relation" preset_name_label="true">
@@ -6841,7 +6900,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=construction" />
             <space />
             <key key="landuse" value="construction" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Brownfield" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=brownfield"
@@ -6852,7 +6911,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=brownfield" />
             <space />
             <key key="landuse" value="brownfield" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Greenfield" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=greenfield"
@@ -6862,7 +6921,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=greenfield" />
             <space />
             <key key="landuse" value="greenfield" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Landfill" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=landfill"
@@ -6873,7 +6932,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=landfill" />
             <space />
             <key key="landuse" value="landfill" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
         </item>
         <item name="Quarry" icon="presets/mine.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=quarry"
@@ -6908,7 +6967,7 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:name"
                   zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Key:name" />
             <space />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional>
                 <text key="alt_name" text="Alternative name" match="key" />
                 <text key="old_name" text="Historical name" match="key" />
@@ -6972,7 +7031,7 @@
             <text key="website" text="Website" match="key" />
             <text key="email" text="Email Address" match="key" />
             <space />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="wikipedia" />
             <text key="image" text="Image" />
         </item>
         <item name="Contact (schema with 'contact:*' prefix)" icon="presets/contact.png" type="node,way,closedway,relation" preset_name_label="true">
@@ -6991,7 +7050,7 @@
             <text key="contact:website" text="Website" match="key" />
             <text key="contact:email" text="Email Address" match="key" />
             <space />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="wikipedia" />
             <text key="image" text="Image" />
         </item>
     </group> <!-- Annotation -->
@@ -7008,7 +7067,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:multipolygon" />
             <key key="type" value="multipolygon" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
             </optional>
             <roles>
                 <role key="outer" text="outer segment" requisite="required" type="way" />
@@ -7025,7 +7084,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:boundary" />
             <space />
             <key key="type" value="boundary" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional>
                 <combo key="boundary" text="Boundary type" values="administrative,national,civil,political" values_searchable="true" />
                 <combo key="admin_level" text="Administrative level" values="1,2,3,4,5,6,7,8,9,10" />
@@ -7068,7 +7127,7 @@
             <key key="type" value="restriction" />
             <combo key="restriction" text="Restriction" values="no_left_turn,no_right_turn,no_straight_on,no_u_turn,only_right_turn,only_left_turn,only_straight_on" values_searchable="true" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
             </optional>
             <roles>
                 <role key="from" text="from way" requisite="required" count="1" type="way" />
@@ -7098,7 +7157,6 @@
             </roles>
         </item>
         <separator/>
-
         <group name="Routes">
             <item name="Bicycle route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=bicycle"
@@ -7116,7 +7174,6 @@
                     <role key="" text="route segment" requisite="required" type="way"/>
                 </roles>
             </item>
-
             <item name="MTB route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Mountain_biking"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Mountain_biking"
@@ -7137,7 +7194,6 @@
                     <role key="" text="route segment" requisite="required" type="way" member_expression="highway=path OR highway=track"/>
                 </roles>
             </item>
-
             <item name="Hiking route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=hiking#Tagging_walking_and_hiking_Route_Networks"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Hiking"
@@ -7160,7 +7216,6 @@
                     <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
                 </roles>
             </item>
-
             <item name="Piste route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=piste"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:route=piste"/>
@@ -7182,7 +7237,6 @@
                     <role key="start" text="entry points" requisite="optional" type="node" />
                 </roles>
             </item>
-
             <item name="Ski route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ski"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=ski"/>
@@ -7204,7 +7258,6 @@
                     <role key="start" text="entry points" requisite="optional" type="node" />
                 </roles>
             </item>
-
             <separator/>
             <item name="Detour route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=detour"
@@ -7252,8 +7305,8 @@
                 <key key="type" value="route"/>
                 <key key="route" value="road"/>
                 <reference ref="name_ref"/>
-                <text key="network" text="Network" />
-                <text key="operator" text="Operator" />
+                <reference ref="network" />
+                <reference ref="operator" />
                 <text key="distance" text="Distance (km)"/>
                 <roles>
                     <role key="" text="route segment" requisite="optional" type="way" member_expression="highway"/>
@@ -7262,17 +7315,15 @@
                     <role key="link" text="link segment" requisite="optional" type="way" member_expression="highway"/>
                 </roles>
             </item>
-
         </group> <!-- Routes -->
-
         <item name="Route Network" icon="presets/path.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network" />
             <space />
             <key key="type" value="network" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional>
-                <text key="network" text="Network" />
-                <text key="operator" text="Operator" />
+                <reference ref="network" />
+                <reference ref="operator" />
             </optional>
             <roles>
                 <role key="" text="member" requisite="required" type="relation" />
@@ -7300,7 +7351,7 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:street" />
             <space />
             <key key="type" value="street" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <roles>
                 <role key="street" text="ways being part of street" requisite="required" type="way" />
                 <role key="address" text="addresses belonging to the street" requisite="optional" type="node,way,closedway" />
@@ -7337,16 +7388,16 @@
             <space />
             <key key="type" value="waterway" />
             <combo key="waterway" text="Subtype of waterway (largest one of members)" values="river,stream,canal,drain,ditch" values_searchable="true" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional>
                 <text key="destination" text="Name of river/sea/ocean" />
-                <text key="ref" text="Reference" />
+                <reference ref="ref" />
                 <text key="ref:sandre" text="Reference Sandre (FR)" />
                 <text key="ref:fgkz" text="Reference FGKZ (DE)" />
                 <text key="ref:regine" text="Reference REGINE (NO)" />
                 <text key="ref:gnis" text="Reference GNIS (USA)" />
                 <text key="ref:gnbc" text="Reference GNBC (CA)" />
-                <text key="wikipedia" text="Wikipedia" />
+                <reference ref="wikipedia" />
             </optional>
             <roles>
                 <role key="" text="waterways (no riverbank)" requisite="optional" type="way" member_expression="waterway -waterway:riverbank" />
@@ -7362,11 +7413,11 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relations/Proposed/Bridges_and_Tunnels" />
             <space />
             <key key="type" value="bridge" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+            <reference ref="layer" />
             <reference ref="name_ref" />
-            <text key="height" text="Height (meters)" />
-            <text key="length" text="Length (meters)" />
-            <text key="operator" text="Operator" />
+            <reference ref="height" />
+            <reference ref="length" />
+            <reference ref="operator" />
             <roles>
                 <role key="across" text="ways supported by (on top of) the bridge" requisite="optional" type="way" />
                 <role key="under" text="ways passing under the bridge" requisite="optional" type="way" />
@@ -7378,10 +7429,10 @@
             <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels" />
             <space />
             <key key="type" value="tunnel" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+            <reference ref="layer" />
             <reference ref="name_ref" />
-            <text key="length" text="Length (meters)" />
-            <text key="operator" text="Operator" />
+            <reference ref="length" />
+            <reference ref="operator" />
             <roles>
                 <role key="through" text="ways passing through the tunnel" requisite="required" type="way" />
                 <role key="outline" text="way forming the outline footprint" requisite="optional" count="1" type="closedway,relation" />