Index: src/org/openstreetmap/josm/resources/data/defaultpresets.xml
===================================================================
--- src/org/openstreetmap/josm/resources/data/defaultpresets.xml    (revision 16137)
+++ src/org/openstreetmap/josm/resources/data/defaultpresets.xml    (working copy)
@@ -174,11 +174,14 @@
         <reference ref="internet" />
         <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,outside,no" />
     </chunk>
+    <chunk id="height">
+        <text key="height" text="Height (meters)" length="7" />
+    </chunk> <!-- height -->
     <chunk id="optional_height">
         <optional>
-            <text key="height" text="Height (meters)" length="7" />
+            <reference ref="height" />
         </optional>
-    </chunk>
+    </chunk> <!-- optional height -->
     <chunk id="optional_maxwidth">
         <optional>
             <text key="maxwidth" text="Max. width (meters)" length="7" />
@@ -208,38 +211,41 @@
     <chunk id="sport">
         <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,beachvolleyball,billiards,boules,bowls,canadian_football,canoe,climbing,cricket,croquet,cycling,dog_racing,equestrian,field_hockey,fitness,gaelic_games,golf,gymnastics,handball,horse_racing,ice_hockey,karting,model_aerodrome,motocross,motor,pelota,racquet,rc_car,rowing,rugby_league,rugby_union,running,safety_training,shooting,skateboard,ice_skating,roller_skating,soccer,swimming,table_tennis,tennis,volleyball,9pin,10pin" values_context="sport" />
     </chunk>
+    <chunk id="general_access">
+        <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" values_sort="false" />
+    </chunk> <!-- general access -->
+    <chunk id="site_access">
+        <combo key="access" text="General Access" values="yes,permissive,customers,private,no" values_sort="false" />
+    </chunk> <!-- site access -->
     <chunk id="fee">
-        <combo key="fee" text="Fee" values="yes,no" />
-    </chunk>
+        <combo key="fee" text="Fee" values="yes,no" values_sort="false" />
+    </chunk> <!-- fee -->
     <chunk id="fee_interval">
-        <combo key="fee" text="Fee" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
-    </chunk>
+        <combo key="fee" text="Fee" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" values_sort="false" />
+    </chunk> <!-- fee interval-->
     <chunk id="parking_name_type_ref">
         <text key="name" text="Name" />
         <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" values_context="parking" />
         <text key="ref" text="Reference number" />
-    </chunk>
+    </chunk> <!-- parking name type ref -->
     <chunk id="parking_access_fee_operator_surface_smoothness">
         <space />
-        <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
+        <reference ref="site_access" />
         <reference ref="fee_interval" />
         <text key="operator" text="Operator" />
         <reference ref="surface_smoothness" />
-    </chunk>
+    </chunk> <!-- parking access fee operator surface smoothness -->
     <chunk id="maxstay">
         <combo key="maxstay" text="Time Limit (minutes)" values="0,30,60,90,120,180" />
-    </chunk>
+    </chunk> <!-- maxstay -->
     <chunk id="supervised">
-        <combo key="supervised" text="Supervised" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
-    </chunk>
+        <combo key="supervised" text="Supervised" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" values_sort="false" />
+    </chunk> <!-- supervised -->
     <chunk id="supervised_lit_oh">
         <reference ref="supervised" />
-        <combo key="lit" text="Lit" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
+        <combo key="lit" text="Lit" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" values_sort="false" />
         <reference ref="oh" />
-    </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> <!-- supervised lit oh -->
     <chunk id="name_wikipedia">
         <text key="name" text="Name" />
         <text key="wikipedia" text="Wikipedia" />
@@ -252,9 +258,9 @@
     <chunk id="route_hikebike_optionals">
         <text key="ref" text="Reference" />
         <text key="operator" text="Operator" />
-        <text key="distance" text="Distance (km)"/>
-        <text key="ascent" text="Ascent (m)"/>
-        <text key="descent" text="Descent (m)"/>
+        <text key="distance" text="Distance (kilometers)"/>
+        <text key="ascent" text="Ascent (meters)"/>
+        <text key="descent" text="Descent (meters)"/>
         <check key="roundtrip" text="Roundtrip"/>
         <text key="symbol" text="Symbol description"/>
         <text key="description" text="Description"/>
@@ -265,8 +271,8 @@
         <text key="taxon" text="Taxon" />
     </chunk>
     <chunk id="leaf">
-        <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,mixed,leafless" values_searchable="true" />
-        <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" >
+        <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,mixed,leafless" values_searchable="true" values_sort="false" />
+        <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" values_sort="false">
             <list_entry value="deciduous" short_description="Plants that are leafless for a certain period during the year." />
             <list_entry value="evergreen" short_description="Plants that are never entirely without green foliage." />
             <list_entry value="semi_deciduous" short_description="Plants that lose their foliage for a very short period, when old leaves fall off and new foliage growth is starting." />
@@ -275,8 +281,8 @@
         </combo>
     </chunk>
     <chunk id="leaf_without_mixed">
-        <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,leafless" values_searchable="true" />
-        <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" >
+        <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,leafless" values_searchable="true" values_sort="false" />
+        <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" values_sort="false">
             <list_entry value="deciduous" short_description="Plants that are leafless for a certain period during the year." />
             <list_entry value="evergreen" short_description="Plants that are never entirely without green foliage." />
             <list_entry value="semi_deciduous" short_description="Plants that lose their foliage for a very short period, when old leaves fall off and new foliage growth is starting." />
@@ -284,33 +290,33 @@
         </combo>
     </chunk>
     <!-- start of religions and denominations -->
-        <chunk id="religious"> <!-- all religions and denominations -->
-            <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" values_searchable="true" />
-            <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,conservative,evangelical,greek_catholic,greek_orthodox,ibadi,iglesia_ni_cristo,jehovahs_witness,lutheran,mahayana,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reform,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,shaivism,shaktism,shia,smartism,spiritist,sunni,tibetan,theravada,united,united_methodist,vaishnavism,vajrayana" values_searchable="true" />
-        </chunk>
-        <chunk id="religious_catholic_christian"> <!-- special case for wayside_shrine and wayside_cross: all religions and catholic denominations with default to catholic christian -->
-            <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" default="christian" values_searchable="true" />
-            <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" values_searchable="true" />
-        </chunk>
-        <chunk id="other_religions"> <!-- religions which don't have an own preset -->
-            <combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
-        </chunk> 
-        <chunk id="christian_denominations"> <!-- christian denominations -->
-            <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,evangelical,greek_catholic,greek_orthodox,iglesia_ni_cristo,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,spiritist,united,united_methodist" values_searchable="true" />
-        </chunk>
-        <chunk id="muslim_denominations"> <!-- muslim denominations -->
-            <combo key="denomination" text="Denomination" values="ibadi,nondenominational,shia,sunni" values_searchable="true" />
-        </chunk>
-        <chunk id="jewish_denominations"> <!-- jewish denominations -->
-            <combo key="denomination" text="Denomination" values="orthodox,conservative,nondenominational,reform" values_context="jewish" values_searchable="true" /> <!-- values_context because of orthodox, #9629 -->
-        </chunk>
-        <chunk id="buddhist_denominations"> <!-- buddhist denominations -->
-            <combo key="denomination" text="Denomination" values="tibetan,theravada,mahayana,vajrayana" values_searchable="true" />
-        </chunk>
-        <chunk id="hindu_denominations"> <!-- hindu denominations -->
-            <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
-        </chunk>
-        <!-- shinto and the religions which don't have an own preset don't have denominations (yet) -->
+    <chunk id="religious"> <!-- all religions and denominations -->
+        <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" values_searchable="true" />
+        <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,conservative,evangelical,greek_catholic,greek_orthodox,ibadi,iglesia_ni_cristo,jehovahs_witness,lutheran,mahayana,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reform,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,shaivism,shaktism,shia,smartism,spiritist,sunni,tibetan,theravada,united,united_methodist,vaishnavism,vajrayana" values_searchable="true" />
+    </chunk>
+    <chunk id="religious_catholic_christian"> <!-- special case for wayside_shrine and wayside_cross: all religions and catholic denominations with default to catholic christian -->
+        <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" default="christian" values_searchable="true" />
+        <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" values_searchable="true" />
+    </chunk>
+    <chunk id="other_religions"> <!-- religions which don't have an own preset -->
+        <combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
+    </chunk> 
+    <chunk id="christian_denominations"> <!-- christian denominations -->
+        <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,evangelical,greek_catholic,greek_orthodox,iglesia_ni_cristo,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,spiritist,united,united_methodist" values_searchable="true" />
+    </chunk>
+    <chunk id="muslim_denominations"> <!-- muslim denominations -->
+        <combo key="denomination" text="Denomination" values="ibadi,nondenominational,shia,sunni" values_searchable="true" />
+    </chunk>
+    <chunk id="jewish_denominations"> <!-- jewish denominations -->
+        <combo key="denomination" text="Denomination" values="orthodox,conservative,nondenominational,reform" values_context="jewish" values_searchable="true" /> <!-- values_context because of orthodox, #9629 -->
+    </chunk>
+    <chunk id="buddhist_denominations"> <!-- buddhist denominations -->
+        <combo key="denomination" text="Denomination" values="tibetan,theravada,mahayana,vajrayana" values_searchable="true" />
+    </chunk>
+    <chunk id="hindu_denominations"> <!-- hindu denominations -->
+        <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
+    </chunk>
+    <!-- shinto and the religions which don't have an own preset don't have denominations (yet) -->
     <!-- end of religions and denominations --> 
     <chunk id="voltage">
         <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,22000,20000,15000,110000;20000" />
@@ -370,7 +376,7 @@
         </optional>
     </chunk>
     <chunk id="power_pole">
-        <text key="height" text="Height (meters)" />
+        <reference ref="height" />
         <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
         <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
         <check key="location:transition" text="Location transition" disable_off="true" />
@@ -451,84 +457,106 @@
     </chunk>
     <chunk id="car_brands">
     <multiselect key="brand" text="Car brand" values="Alfa Romeo;Aston Martin;Audi;Bentley;BMW;Buick;Cadillac;Chevrolet;Chrysler;Citroën;Dacia;Daewoo;Daihatsu;Dodge;Ferrari;Fiat;Ford;GMC;Great Wall;Holden;Honda;Hyundai;Infiniti;Isuzu;Jaguar;Jeep;Kia;Lada;Lancia;Land Rover;Lexus;Lincoln;Lotus;Maserati;Mazda;Mercedes-Benz;Mini;Mitsubishi;Nissan;Opel;Peugeot;Porsche;Renault;Saab;Seat;Škoda;Smart;SsangYong;Subaru;Suzuki;Tata;Toyota;Vauxhall;Volkswagen;Volvo" values_no_i18n="true" />
-  </chunk>
-  <chunk id="motorcycle_brands">
-    <multiselect key="brand" text="Motorcycle brand" values="Aprillia;BMW;Ducati;Gilera;Harley-Davidson;Honda;Kawasaki;KTM;Kymco;Piaggio;Peugeot;Piaggio;Suzuki;Triumph;Vespa;Yamaha" values_no_i18n="true" />
-  </chunk>
-  <chunk id="walking_routes_roles">
-     <roles>
-         <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/>
-         <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
-         <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"/>
-         <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
-     </roles>
-  </chunk>
-  <chunk id="route_segment_roles">
-     <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track"/>
-     <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
-     <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
-     <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
-  </chunk>
-  <chunk id="route_start_stop_roles">
-     <role key="start" text="start endpoint" requisite="optional" type="node" />
-     <role key="stop" text="stop endpoint" requisite="optional" type="node" />
-     <role key="start_stop" text="start and stop endpoint" requisite="optional" type="node" />
-  </chunk>
-  <!-- Link chunks -->
-  <chunk id="link_contact_address">
-    <preset_link preset_name="Contact (Common Schema)" />
-    <preset_link preset_name="Address" />
-  </chunk>
-  <chunk id="link_contact_address_payment">
-    <preset_link preset_name="Contact (Common Schema)" />
-    <preset_link preset_name="Address" />
-    <preset_link preset_name="Payment Methods" />
-  </chunk>
-  <chunk id="public_transport_route_optionals">
-    <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" />
-    <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
-    <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
-    <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
-  </chunk>
-  <chunk id="climbing_styles">
-    <label text="Climbing styles:" />
-    <checkgroup columns="2">
-      <check key="climbing:boulder" text="Boulders" />
-      <check key="climbing:sport" text="Sport climbing" />
-         <check key="climbing:toprope" text="Top rope (approach at the route top + letting the rope down)" />
-         <check key="climbing:trad" text="Traditional climbing (no fixed anchors)" />
-      <check key="climbing:multipitch" text="Multi-pitch climbing" />
-      <check key="climbing:ice" text="Ice climbing" />
-      <check key="climbing:mixed" text="Mixed climbing" />
-      <check key="climbing:deepwater" text="Deep Water Soloing" />
-    </checkgroup>
-  </chunk>
-  <chunk id="climbing_optional_attributes">
-    <optional>
-      <combo key="climbing:orientation" text="Orientation" values="N,NE,E,SE,S,SW,W,NW" values_no_i18n="true" values_sort="false"/>
-      <combo key="climbing:quality" text="Rock/ice quality" values="fragile,medium,solid" />
-      <combo key="climbing:rock" text="Rock type" rows="3" values="limestone,sandstone,granite,basalt,slate" />
-      <check key="climbing:summit_log" text="Summit/route log/register" />
-      <check key="indoor" text="Climbing routes indoor" />
-      <check key="outdoor" text="Climbing routes outdoor" />           
-      <text key="website" text="Official web site (e.g. operator)" />
-      <text key="url" text="Unofficial web site" />
-      <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|sunset-sunrise open; sunrise-sunset closed|Mar-Jun closed; Jul-Feb Mo-Su,PH sunrise-sunset|Mo-Fr 15:00-22:00; Sa-Su 11:00-22:00" values_no_i18n="true"/>
-      <combo key="fee" text="Fee" values="yes,no,Sa-Su 08:00-20:00"/>
-      <combo key="access" text="Access" values="yes,no,customers,private" />
-    </optional>
-  </chunk>
-  <chunk id="nudism">
-    <combo key="nudism" text="Nudism" values="yes,no,obligatory,designated,customary,permissive" />
-  </chunk>
-  <chunk id="wall_material">
-    <combo key="material" text="Material" values="adobe,brick,concrete,masonry,reinforced_concrete,stone" />
-  </chunk>
+    </chunk>
+    <chunk id="motorcycle_brands">
+        <multiselect key="brand" text="Motorcycle brand" values="Aprillia;BMW;Ducati;Gilera;Harley-Davidson;Honda;Kawasaki;KTM;Kymco;Piaggio;Peugeot;Piaggio;Suzuki;Triumph;Vespa;Yamaha" values_no_i18n="true" />
+    </chunk>
+    <chunk id="walking_routes_roles">
+        <roles>
+            <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/>
+            <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
+            <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"/>
+            <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
+        </roles>
+    </chunk>
+    <chunk id="route_segment_roles">
+        <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track"/>
+        <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
+        <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
+        <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
+    </chunk>
+    <chunk id="route_start_stop_roles">
+        <role key="start" text="start endpoint" requisite="optional" type="node" />
+        <role key="stop" text="stop endpoint" requisite="optional" type="node" />
+        <role key="start_stop" text="start and stop endpoint" requisite="optional" type="node" />
+    </chunk>
+    <!-- Link chunks -->
+    <chunk id="link_contact_address">
+        <preset_link preset_name="Contact (Common Schema)" />
+        <preset_link preset_name="Address" />
+    </chunk>
+    <chunk id="link_contact_address_payment">
+        <preset_link preset_name="Contact (Common Schema)" />
+        <preset_link preset_name="Address" />
+        <preset_link preset_name="Payment Methods" />
+    </chunk>
+    <chunk id="public_transport_route_optionals">
+        <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" />
+        <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
+        <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
+        <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
+    </chunk>
+    <chunk id="climbing_styles">
+        <label text="Climbing styles:" />
+        <checkgroup columns="2">
+            <check key="climbing:boulder" text="Boulders" />
+            <check key="climbing:sport" text="Sport climbing" />
+                 <check key="climbing:toprope" text="Top rope (approach at the route top + letting the rope down)" />
+                 <check key="climbing:trad" text="Traditional climbing (no fixed anchors)" />
+            <check key="climbing:multipitch" text="Multi-pitch climbing" />
+            <check key="climbing:ice" text="Ice climbing" />
+            <check key="climbing:mixed" text="Mixed climbing" />
+            <check key="climbing:deepwater" text="Deep Water Soloing" />
+        </checkgroup>
+    </chunk>
+    <chunk id="climbing_optional_attributes">
+        <optional>
+            <combo key="climbing:orientation" text="Orientation" values="N,NE,E,SE,S,SW,W,NW" values_no_i18n="true" values_sort="false"/>
+            <combo key="climbing:quality" text="Rock/ice quality" values="fragile,medium,solid" />
+            <combo key="climbing:rock" text="Rock type" rows="3" values="limestone,sandstone,granite,basalt,slate" />
+            <check key="climbing:summit_log" text="Summit/route log/register" />
+            <check key="indoor" text="Climbing routes indoor" />
+            <check key="outdoor" text="Climbing routes outdoor" />           
+            <text key="website" text="Official web site (e.g. operator)" />
+            <text key="url" text="Unofficial web site" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|sunset-sunrise open; sunrise-sunset closed|Mar-Jun closed; Jul-Feb Mo-Su,PH sunrise-sunset|Mo-Fr 15:00-22:00; Sa-Su 11:00-22:00" values_no_i18n="true" />
+            <reference ref="fee_interval" />
+            <reference ref="site_access" />
+        </optional>
+    </chunk>
+    <chunk id="nudism">
+        <combo key="nudism" text="Nudism" values="yes,no,obligatory,designated,customary,permissive" />
+    </chunk> <!-- Nudism -->
+    <chunk id="wall_material">
+        <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" values_searchable="true" />
+    </chunk> <!-- Wall material -->
+    <chunk id="ele">
+        <text key="ele" text="Elevation from sea level (meters)" lenght="10" />
+    </chunk> <!-- Elevation -->
+    <chunk id="optional_public_building">
+        <optional>
+            <reference ref="name_ref_operator" />
+            <reference ref="height" />
+            <reference ref="ele" />
+            <reference ref="wall_material" />
+            <reference ref="site_access" />
+            <reference ref="oh" />
+            <reference ref="fee_interval" />
+        </optional>
+    </chunk> <!-- Public building optional attributes -->
+    <chunk id="tower_construct">
+        <combo key="tower:construction" text="Type of construction" values_sort="false" values_searchable="true">
+            <list_entry value="lattice" display_value="lattice" icon="presets/landmark/Tower_lattice.svg" />
+            <list_entry value="freestanding" display_value="freestanding" icon="presets/landmark/Tower_freestanding.svg" />
+            <list_entry value="dome" display_value="Dome" icon="presets/landmark/Tower_dome.svg" />
+            <list_entry value="dish" display_value="Dish" icon="presets/landmark/Tower_dish.svg" />
+        </combo>
+    </chunk> <!-- Tower construction -->
   <!--  Groups -->
   <group name="Highways" icon="presets/transport/way/way_secondary.svg">
     <group name="Streets" icon="presets/transport/way/way_secondary.svg">
@@ -857,7 +885,7 @@
         <item name="Construction" icon="presets/transport/way/way_construction.svg" type="way,closedway" preset_name_label="true">
             <link wiki="Key:construction" />
             <key key="highway" value="construction" />
-            <combo key="construction" text="Highway type" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,secondary_link,tertiary,tertiary_link,unclassified,residential,service,bus_guideway,bridleway,living_street,pedestrian,track,path,footway,cycleway,steps" values_context="Highway" />
+            <combo key="construction" text="Highway type" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,secondary_link,tertiary,tertiary_link,unclassified,residential,service,bus_guideway,bridleway,living_street,pedestrian,track,path,footway,cycleway,steps" values_context="Highway" values_sort="false" />
             <optional>
                 <text key="name" text="Name" />
                 <reference ref="highway_base" />
@@ -882,26 +910,26 @@
             </checkgroup>
             <space />
             <label text="Transport mode restrictions" />
-            <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" match="key" values_searchable="true" />
-            <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" />
-            <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" />
+            <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" values_searchable="true" values_sort="false" match="key" />
+            <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" match="key" />
+            <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" match="key" />
             <space />
             <label text="Vehicles per type" />
-            <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
-            <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,use_sidepath,no" match="key" />
-            <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
-            <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
-            <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
-            <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
-            <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
-            <combo key="agricultural" text="Agricultural Vehicles (with restrictions e.g. max. 25 km/h)" values="yes,official,designated,destination,permissive,private,no" match="key" />
-            <combo key="4wd_only" text="4WD only" values="yes,recommended,no" match="key" />
+            <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
+            <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,use_sidepath,no" values_sort="false" match="key" />
+            <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
+            <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
+            <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
+            <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
+            <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
+            <combo key="agricultural" text="Agricultural Vehicles (with restrictions e.g. max. 25 km/h)" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
+            <combo key="4wd_only" text="4WD only" values="yes,recommended,no" values_sort="false" match="key" />
             <space />
             <label text="Vehicles per use" />
-            <combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,no" match="keyvalue" />
-            <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" />
+            <combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,no" values_sort="false" match="keyvalue" />
+            <combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
+            <combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
+            <combo key="tourist_bus" text="Tourist buses" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
             <space />
             <text key="maxspeed" text="Max. speed (km/h)" />
             <text key="maxspeed:forward" text="Max. speed in way direction" />
@@ -913,7 +941,7 @@
             <text key="maxheight" text="Max. height (meters)" match="key" />
             <text key="maxwidth" text="Max. width (meters)" match="key" />
             <text key="maxlength" text="Max. length (meters)" match="key" />
-            <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" values_context="overtaking" match="key" />
+            <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" values_context="overtaking" values_sort="false" match="key" />
         </item> <!-- Road Restrictions -->
         <separator/>
         <item name="Roundabout" icon="presets/vehicle/restriction/roundabout_right.svg" type="node,way,closedway" preset_name_label="true">
@@ -1307,7 +1335,7 @@
                 <check key="indoor" text="Indoor" />
                 <reference ref="fee" />
                 <combo key="goods" text="Freight elevator" values="yes,designated,no" />
-                <combo key="access" text="Access" values="yes,no,customers,private" />
+                <reference ref="site_access" />
                 <combo key="surveillance" text="Surveillance Camera" values="indoor,outdoor" />
             </optional>
         </item> <!-- Elevator -->
@@ -1322,7 +1350,7 @@
             <key key="mountain_pass" value="yes" />
             <optional>
                 <text key="name" text="Name" />
-                <text key="ele" text="Elevation" />
+                <reference ref="ele" />
                 <text key="wikipedia" text="Wikipedia" />
             </optional>
         </item> <!-- Mountain Pass -->
@@ -1390,7 +1418,7 @@
             <reference ref="leaf" />
             <optional>
                 <reference ref="genus_species_taxon" />
-                <text key="height" text="Height (meters)" length="7" />
+                <reference ref="height" />
             </optional>
         </item> <!-- Hedge -->
         <item name="Fence" icon="presets/barrier/fence.svg" type="way,closedway" preset_name_label="true">
@@ -1398,7 +1426,7 @@
             <key key="barrier" value="fence" />
             <optional>
                 <combo key="fence_type" text="Type" values="barbed_wire,bars,chain_link,concrete,electric,metal,pole,railing,split_rail,wire,wood" />
-                <text key="height" text="Height (meters)" length="7" />
+                <reference ref="height" />
             </optional>
         </item> <!-- Fence -->
         <item name="Handrail" icon="presets/barrier/handrail.svg" type="way,closedway" preset_name_label="true">
@@ -1680,7 +1708,7 @@
             <space />
             <key key="waterway" value="waterfall" />
             <reference ref="name_wikipedia" />
-            <text key="height" text="Height (meters)" />
+            <reference ref="height" />
         </item> <!-- Waterfall -->
         <item name="Weir" icon="presets/nautical/weir.svg" type="node,way" preset_name_label="true">
             <link wiki="Tag:waterway=weir" />
@@ -1767,7 +1795,7 @@
             <check key="salt" text="Salt Water" disable_off="true" />
             <check key="intermittent" text="Intermittent (contains not permanently water)" disable_off="true" />
             <check key="tidal" text="In the tidal range" disable_off="true" />
-            <text key="ele" text="Elevation" />
+            <reference ref="ele" />
             <text key="wikipedia" text="Wikipedia" />
             <reference ref="water_access" />
         </item> <!-- Water -->
@@ -1812,7 +1840,7 @@
             <optional>
                 <reference ref="supervised" />
                 <reference ref="oh_wheelchair" />
-                <reference ref="general_access" />
+                <reference ref="site_access" />
                 <combo key="surface" text="Surface" values="gravel,pebblestone,sand" />
                 <combo key="sport" text="Sport" values="swimming,surfing" />
                 <reference ref="nudism" />
@@ -2912,7 +2940,7 @@
             <space />
             <key key="tourism" value="alpine_hut" />
             <reference ref="name_operator" />
-            <text key="ele" text="Elevation" />
+            <reference ref="ele" />
             <text key="rooms" text="Rooms" />
             <text key="beds" text="Beds" />
             <combo key="reservation" text="Reservation" values="yes,no,required,recommended,members_only" />
@@ -2927,14 +2955,14 @@
             <space />
             <key key="tourism" value="wilderness_hut" />
             <reference ref="name_operator" />
-            <combo key="access" text="Access rights" values="yes,permissive,customers,private" />
+            <reference ref="site_access" />
             <text key="capacity" text="Capacity" />
             <reference ref="fee" />
             <check key="toilets" text="Toilets" />
             <check key="shower" text="Shower" />
             <combo key="drinking_water" text="Drinking Water" values="yes,no,seasonal" />
             <combo key="reservation" text="Reservation" values="yes,no,required,recommended,members_only" />
-            <text key="ele" text="Elevation" />
+            <reference ref="ele" />
             <text key="description" text="Closer description" />
             <space />
             <reference ref="link_contact_address_payment" />
@@ -3208,7 +3236,7 @@
             <key key="tourism" value="information" />
             <key key="information" value="guidepost" />
             <reference ref="name_ref_operator" />
-            <text key="ele" text="Elevation" />
+            <reference ref="ele" />
             <optional text="Routes shown for:">
                 <check key="hiking" text="Hiking" />
                 <check key="bicycle" text="Cycling" />
@@ -3274,7 +3302,7 @@
             <space />
             <key key="leisure" value="bandstand" />
             <reference ref="name_operator_oh_wheelchair" />
-            <combo key="access" text="Access" values="yes,permissive,private" />
+            <reference ref="site_access" />
         </item> <!-- Bandstand -->
         <item name="Zoo" icon="presets/leisure/zoo.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:tourism=zoo" />
@@ -3343,7 +3371,7 @@
             <space />
             <label text="Used for the water area only." />
             <space />
-            <combo key="access" text="Access" values="yes,customers,private" />
+            <reference ref="site_access" />
         </item> <!-- Swimming Pool -->
         <item name="Dive centre" icon="presets/leisure/dive_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=dive_centre" />
@@ -3366,7 +3394,7 @@
             <space />
             <key key="leisure" value="sauna" />
             <reference ref="name_operator_oh_wheelchair" />
-            <combo key="access" text="Access" values="yes,permissive,private" />
+            <reference ref="site_access" />
             <space />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Sauna -->
@@ -3838,7 +3866,7 @@
             <text key="defibrillator:location" text="Location description" />
             <text key="phone" text="Phone number" />
             <label text="Use E.123 format, e.g. +49 11223 456 7890" />
-            <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
+            <reference ref="site_access" />
             <check key="indoor" text="Located inside a building?" />
             <!-- lastcheck is in use for aed devices, but not yet well discussed or documented
             <optional>
@@ -4021,7 +4049,7 @@
             <space />
             <key key="amenity" value="toilets" />
             <optional>
-                <combo key="access" text="Access rights" values="yes,permissive,customers" />
+                <reference ref="site_access" />
                 <checkgroup columns="3">
                     <check key="female" text="Female" text_context="restroom" />
                     <check key="male" text="Male" text_context="restroom" />
@@ -4041,7 +4069,7 @@
             <link wiki="Tag:amenity=shower" />
             <space />
             <key key="amenity" value="shower" />
-            <combo key="access" text="Access rights" values="yes,permissive,customers" />
+            <reference ref="site_access" />
             <optional>
                 <checkgroup columns="3">
                     <check key="female" text="Female" text_context="restroom" />
@@ -4194,7 +4222,7 @@
             <check key="sanitary_dump_station:pump-out" text="Suction pumpout" />
             <check key="sanitary_dump_station:round_drain" text="Gravity drain for hose" />
             <check key="sanitary_dump_station:basin" text="Casette or Elsan Disposal" />
-            <combo key="access" text="Access" values="yes,customers,no" />
+            <reference ref="site_access" />
             <reference ref="fee" />
             <text key="operator" text="Operator" />
             <combo key="opening_hours" text="Operation times" values="24/7" values_no_i18n="true" />
@@ -4228,7 +4256,7 @@
             <link wiki="Tag:amenity=hunting_stand" />
             <space />
             <key key="amenity" value="hunting_stand" />
-            <text key="height" text="Height (meters)" />
+            <reference ref="height" />
             <check key="shelter" text="Shelter" />
             <check key="hide" text="Hide" text_context="hunting stand" />
             <check key="lockable" text="Lockable" />
@@ -4267,8 +4295,7 @@
             <link wiki="Tag:amenity=compressed_air" />
             <space />
             <key key="amenity" value="compressed_air" />
-            <reference ref="name_ref" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_ref_operator" />
             <reference ref="fee" />
             <multiselect key="valves" text="Valves" values="dunlop;schrader;sclaverand;regina" display_values="Dunlop (Woods);Schrader;Sclaverand (Presta);Regina" values_searchable="true" />
         </item> <!-- Compressed Air -->
@@ -4467,7 +4494,7 @@
             <combo key="leisure" text="Type" values="sports_centre" />
             <reference ref="climbing_styles" />
             <text key="climbing:routes" text="Number of routes" />
-            <text key="ele" text="Usual elevation at the bottom of the routes" />
+            <text key="ele" text="Usual elevation at the bottom of the routes" lenght="10" />
             <space />
             <combo key="climbing:length" text="Usual route length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
             <combo key="climbing:length:min" text="Minimal climbing length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
@@ -4812,7 +4839,7 @@
             <optional>
                 <text key="name" text="Name" />
                 <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
-                <text key="height" text="Height (meters)" />
+                <reference ref="height" />
             </optional>
             <preset_link preset_name="Address" />
         </item> <!-- Building -->
@@ -4823,7 +4850,7 @@
             <optional>
                 <text key="name" text="Name" />
                 <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
-                <text key="height" text="Height (meters)" />
+                <reference ref="height" />
             </optional>
             <preset_link preset_name="Address" />
         </item> <!-- Residential Building -->
@@ -4832,9 +4859,9 @@
             <space />
             <combo key="building:part" text="Building part" values="allotment_house,bakehouse,barn,college,commercial,construction,cowshed,farm_auxiliary,garage,garages,greenhouse,hangar,hospital,industrial,office,retail,roof,ruins,school,shed,supermarket,toilets,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
             <text key="name" text="Name" />
-            <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
-            <combo key="building:min_level" text="Skipped Levels" values="1,2,3,4,5,6,7,8,9,10" text_context="building" />
-            <text key="height" text="Height (meters)" />
+            <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" values_searchable="false" />
+            <combo key="building:min_level" text="Skipped Levels" values="1,2,3,4,5,6,7,8,9,10" text_context="building" values_searchable="false" />
+            <reference ref="height" />
             <text key="min_height" text="Skipped height (meters)" />
         </item> <!-- Building part -->
         <item name="Entrance" icon="presets/misc/entrance_yes.svg" type="node" preset_name_label="true">
@@ -4849,7 +4876,7 @@
                 <list_entry value="staircase" icon="presets/misc/entrance_yes.svg" />
                 <list_entry value="home" icon="presets/misc/entrance_yes.svg" />
             </combo>
-            <combo key="access" text="Access" values="yes,delivery,private,no" />
+            <combo key="access" text="Access" values="yes,delivery,permissive,customers,private,no" values_sort="false" />
             <reference ref="wheelchair" />
             <optional>
                 <text key="ref" text="Entrance number" />
@@ -4866,17 +4893,37 @@
             </optional>
             <reference ref="link_contact_address" />
         </item> <!-- Non-public police facility -->
-        <item name="Tower" icon="presets/landmark/tower.svg" type="node,closedway" preset_name_label="true">
+        <item name="Tower" icon="presets/landmark/Tower_dome.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:man_made=tower" />
             <space />
+            <label text=" See Man_Made/Big Communication Tower preset" />
+            <label text="  for big communication towers !" />
+            <preset_link preset_name="Big Communication Tower" />
+            <label text=" Consider using man_made=mast for smaller constructions !" />
+            <space />
             <key key="man_made" value="tower" />
-            <text key="name" text="Name" />
-            <combo key="tower:type" text="Tower type" values="bell_tower,communication,cooling,defensive,observation,radar,watchtower" values_searchable="true" />
-            <optional>
-                <text key="height" text="Height (meters)" />
-                <text key="operator" text="Operator" />
-            </optional>
+            <combo key="tower:type" text="Type of tower" values="communication,observation,watchtower,defensive,cooling,radar,lighting,bell_tower,minaret" display_values="Communication tower,Observation tower,Watch Tower,Fortified defensive tower,Cooling tower,Radar tower,Lighting tower,Bell tower or church tower,Minaret" values_searchable="true" values_sort="false" />
+            <reference ref="tower_construct" />
+            <reference ref="optional_public_building" />
+            <reference ref="link_contact_address" />
         </item> <!-- Tower -->
+        <item name="Big Communication Tower" icon="presets/landmark/Communication_tower-14.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:man_made=communications_tower" />
+            <space />
+            <label text=" Big communication tower, usually 100 meters or higher." />
+            <space />
+            <label text="  Use Man_Made/Tower preset for smaller ones ! " />
+            <preset_link preset_name="Tower" />
+            <space />
+            <key key="man_made" value="communications_tower" />
+            <multiselect key="tower:type" text="Type of tower" values_sort="false" default="communication" rows="3">
+                <list_entry value="communication" display_value="Communication tower" icon="presets/landmark/Tower_cantilever_communication.svg" />
+                <list_entry value="watchtower" display_value="Watch tower" icon="presets/landmark/Tower_observation.svg" />
+            </multiselect>
+            <reference ref="tower_construct" />
+            <reference ref="optional_public_building" />
+            <reference ref="link_contact_address" />
+        </item> <!-- Big Communication Tower -->
         <item name="Flagpole" icon="presets/misc/flag.svg" type="node" preset_name_label="true">
             <link wiki="Tag:man_made=flagpole" />
             <key key="man_made" value="flagpole" />
@@ -4897,7 +4944,7 @@
             <space />
             <key key="man_made" value="chimney" />
             <reference ref="name_operator" />
-            <text key="height" text="Height (meters)" />
+            <reference ref="height" />
         </item> <!-- Chimney -->
         <item name="Kiln" icon="presets/misc/kiln.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:man_made=kiln" />
@@ -4919,7 +4966,7 @@
             <optional>
                 <reference ref="name_operator" />
                 <combo key="building" text="Building" values="gasometer" values_context="building" />
-                <text key="height" text="Height (meters)" length="7" />
+                <reference ref="height" />
             </optional>
         </item> <!-- Gasometer -->
         <item name="Silo" icon="presets/landmark/silo.svg" type="node,closedway" preset_name_label="true">
@@ -4929,7 +4976,7 @@
             <optional>
                 <reference ref="name_operator" />
                 <combo key="building" text="Building" values="silo" values_context="building" />
-                <text key="height" text="Height (meters)" length="7" />
+                <reference ref="height" />
             </optional>
         </item> <!-- Silo -->
         <item name="Storage Tank" icon="presets/landmark/storage_tank.svg" type="node,closedway">
@@ -4939,7 +4986,7 @@
                 <reference ref="name_operator" />
                 <combo key="building" text="Building" values="storage_tank" values_context="building" />
                 <combo key="content"  text="Content" values="fuel,manure,oil,sewage,silage,slurry,water,wine" values_context="content" />
-                <text key="height" text="Height (meters)" length="7" />
+                <reference ref="height" />
             </optional>
         </item> <!-- Storage Tank -->
         <item name="Bunker Silo" icon="presets/landmark/bunker_silo.svg" type="node,closedway" preset_name_label="true">
@@ -5035,7 +5082,7 @@
             <key key="man_made" value="water_tower" />
              <optional>
                 <reference ref="name_operator" />
-                <text key="height" text="Height (meters)" length="7" />
+                <reference ref="height" />
             </optional>
         </item> <!-- Water Tower -->
         <item name="Water Works" icon="presets/landmark/water_works.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5141,9 +5188,8 @@
             <link wiki="Tag:man_made=survey_point" />
             <space />
             <key key="man_made" value="survey_point" />
-            <text key="name" text="Name" />
-            <text key="ref" text="Reference" />
-            <text key="ele" text="Elevation" />
+            <reference ref="name_ref" />
+            <reference ref="ele" />
             <combo key="material" text="Material" values="andesite,brass,bronze,concrete,granite,metal,steel,stone" />
         </item> <!-- Survey Point -->
         <item name="Surveillance Camera" icon="presets/service/surveillance.svg" type="node" preset_name_label="true">
@@ -5166,7 +5212,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 (meters)" />
+                <reference ref="height" />
             </optional>
         </item> <!-- Surveillance Camera -->
     </group> <!-- Man Made -->
@@ -5508,7 +5554,7 @@
             <link wiki="Tag:building=transformer_tower" />
             <space />
             <key key="building" value="transformer_tower" />
-            <text key="height" text="Height (meters)" />
+            <reference ref="height" />
             <reference ref="ref_operator" />
             <preset_link preset_name="Power Substation" />
         </item> <!-- Transformer Tower -->
@@ -5526,7 +5572,7 @@
             <link wiki="Tag:power=portal" />
             <space />
             <key key="power" value="portal" />
-            <text key="height" text="Height (meters)" />
+            <reference ref="height" />
             <combo key="structure" text="Type of construction" values="lattice,tubular,solid" />
             <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
             <combo key="colour" text="Color (HTML name or hexadecimal code)" values="black,red,white,gray,red/white" values_context="color" />
@@ -5538,7 +5584,7 @@
             <link wiki="Tag:power=tower" />
             <space />
             <key key="power" value="tower" />
-            <text key="height" text="Height (meters)" />
+            <reference ref="height" />
             <combo key="structure" text="Type of construction" values="lattice,tubular,solid" />
             <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
             <combo key="colour" text="Color (HTML name or hexadecimal code)" values="black,red,white,gray,red/white" values_context="color" />
@@ -7062,7 +7108,7 @@
             <space />
             <key key="natural" value="peak" />
             <reference ref="name_wikipedia" />
-            <text key="ele" text="Elevation" />
+            <reference ref="ele" />
         </item> <!-- Peak -->
         <item name="Saddle" icon="presets/landmark/saddle.svg" type="node" preset_name_label="true">
             <link wiki="Tag:natural=saddle" />
@@ -7070,7 +7116,7 @@
             <space/>
             <key key="natural" value="saddle" />
             <reference ref="name_wikipedia" />
-            <text key="ele" text="Elevation" />
+            <reference ref="ele" />
         </item> <!-- Saddle -->
         <item name="Glacier" icon="presets/landmark/glacier.svg" type="closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:natural=glacier" />
@@ -7078,7 +7124,7 @@
             <space />
             <key key="natural" value="glacier" />
             <reference ref="name_wikipedia" />
-            <text key="ele" text="Elevation" />
+            <reference ref="ele" />
         </item> <!-- Glacier -->
         <item name="Volcano" icon="presets/landmark/volcano.svg" type="node" preset_name_label="true">
             <link wiki="Tag:natural=volcano" />
@@ -7086,7 +7132,7 @@
             <space />
             <key key="natural" value="volcano" />
             <reference ref="name_wikipedia" />
-            <text key="ele" text="Elevation" />
+            <reference ref="ele" />
             <optional>
                 <combo key="volcano:status" text="Current Status" values="active,dormant,extinct" />
                 <combo key="volcano:type" text="Type" values="stratovolcano,shield,scoria" />
@@ -7098,7 +7144,7 @@
             <space />
             <key key="natural" value="ridge" />
             <reference ref="name_wikipedia" />
-            <text key="ele" text="Elevation" />
+            <reference ref="ele" />
         </item> <!-- Ridge -->
         <item name="Valley" icon="presets/landmark/valley.svg" type="way" preset_name_label="true">
             <link wiki="Tag:natural=valley" />
@@ -7113,7 +7159,7 @@
             <space />
             <key key="natural" value="cliff" />
             <text key="name" text="Name" />
-            <text key="height" text="Height (meters)" />
+            <reference ref="height" />
         </item> <!-- Cliff -->
         <item name="Cave Entrance" icon="presets/landmark/cave_entrance.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:natural=cave_entrance" />
@@ -7122,7 +7168,7 @@
             <key key="natural" value="cave_entrance" />
             <reference ref="name_wikipedia" />
             <reference ref="oh_wheelchair" />
-            <reference ref="general_access" />
+            <reference ref="site_access" />
             <reference ref="fee" />
         </item> <!-- Cave Entrance -->
         <separator/>
@@ -7163,7 +7209,7 @@
             <optional>
                 <reference ref="genus_species_taxon" />
                 <space />
-                <text key="height" text="Height (meters)" />
+                <reference ref="height" />
                 <text key="diameter_crown" text="Diameter crown (meters)" />
                 <text key="circumference" text="Circumference (meters)" />
                 <space />
@@ -7179,7 +7225,7 @@
             <reference ref="leaf" />
             <optional>
                 <reference ref="genus_species_taxon" />
-                <text key="height" text="Height (meters)" />
+                <reference ref="height" />
             </optional>
         </item> <!-- Tree Row -->
         <item name="Wood" icon="presets/landmark/forest.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -7287,7 +7333,7 @@
             <key key="natural" value="stone" />
             <reference ref="name_wikipedia" />
             <optional>
-                <text key="height" text="Height (meters)" length="7" />
+                <reference ref="height" />
                 <text key="width" text="Width (meters)" />
             </optional>
         </item> <!-- Stone -->
@@ -7567,6 +7613,8 @@
             <space />
             <text key="wikipedia" text="Wikipedia" />
             <text key="image" text="Image" />
+            <space />
+            <preset_link preset_name="Contact (Schema with 'contact:*' Prefix)" />
         </item> <!-- Contact (Common Schema) -->
         <item name="Contact (Schema with 'contact:*' Prefix)" icon="presets/misc/contact.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
             <link wiki="Key:contact" />
@@ -7580,6 +7628,8 @@
             <space />
             <text key="wikipedia" text="Wikipedia" />
             <text key="image" text="Image" />
+            <space />
+            <preset_link preset_name="Contact (Common Schema)" />
         </item> <!-- Contact (Schema with 'contact:*' Prefix) -->
         <item name="Description" icon="presets/misc/description.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
             <link wiki="Key:description" />
@@ -7992,7 +8042,7 @@
             <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="name_ref" />
-            <text key="height" text="Height (meters)" />
+            <reference ref="height" />
             <text key="length" text="Length (meters)" />
             <text key="operator" text="Operator" />
             <roles>