Index: src/org/openstreetmap/josm/resources/data/defaultpresets.xml
===================================================================
--- src/org/openstreetmap/josm/resources/data/defaultpresets.xml    (revision 16316)
+++ src/org/openstreetmap/josm/resources/data/defaultpresets.xml    (working copy)
@@ -13,7 +13,7 @@
 
     <!-- Item chunks -->
     <chunk id="surface">
-        <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,concrete:plates,concrete:lanes,paving_stones,sett,cobblestone,grass_paver,compacted,fine_gravel,gravel,pebblestone,ground,mud,sand,grass,wood,metal" />
+        <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,concrete:plates,concrete:lanes,paving_stones,sett,cobblestone,grass_paver,compacted,fine_gravel,gravel,pebblestone,ground,mud,sand,grass,wood,metal" values_sort="false" />
     </chunk>
     <chunk id="surface_smoothness">
         <reference ref="surface" />
@@ -33,7 +33,7 @@
     </chunk>
     <chunk id="riding_surface">
         <combo key="leisure" text="Type" values="horse_riding,pitch,sports_centre,stadium,track" values_context="riding" />
-        <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
+        <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" values_sort="false" />
     </chunk>
     <chunk id="highway_base">
         <space />
@@ -48,6 +48,9 @@
         <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
         <reference ref="surface_smoothness" />
     </chunk>
+    <chunk id="placement">
+        <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" values_i18n="false" values_searchable="true" values_sort="false" />
+    </chunk> <!-- placement -->
     <chunk id="highway_yesno">
         <checkgroup columns="2">
             <check key="bridge" text="Bridge" disable_off="true" />
@@ -55,10 +58,13 @@
             <check key="tunnel" text="Tunnel" disable_off="true" />
             <check key="cutting" text="Cutting" disable_off="true" />
         </checkgroup>
+    <chunk id="incline">
+    </chunk>
+        <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" values_i18n="false" values_sort="false" />
     </chunk>
     <chunk id="highway_yesno_incline">
         <reference ref="highway_yesno" />
-        <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down"/>
+        <reference ref="incline" />
     </chunk>
     <chunk id="highway_yesno_incline_oneway_lit_width">
         <check key="oneway" text="Oneway" />
@@ -68,13 +74,13 @@
     </chunk>
     <chunk id="highway_yesno_incline_oneway_lit_width_sidewalk">
         <reference ref="highway_yesno_incline_oneway_lit_width" />
-        <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
+        <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" values_sort="false" />
     </chunk>
     <chunk id="railway_service">
-        <combo key="service" text="Service type" values="yard,siding,spur,crossover" />
+        <combo key="service" text="Service type" values="yard,siding,spur,crossover" values_sort="false" />
     </chunk>
     <chunk id="railway_electrified_yesno">
-        <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" values_context="electrified" />
+        <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" values_context="electrified" values_sort="false" />
         <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
         <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
         <reference ref="highway_yesno" />
@@ -135,13 +141,24 @@
         <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 01-53/2 Fr 09:00-12:00; week 02-52/2 We 09:00-12:00" values_no_i18n="true" />
-    </chunk>
+        <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 01-53/2 Fr 09:00-12:00; week 02-52/2 We 09:00-12:00" values_no_i18n="true" values_sort="false" />
+    </chunk> <!-- service times -->
     <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-Su 09:00-21:00|Mo-Sa 08:00-18:00|Mo-Fr 09:00-17: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 01-53/2 Fr 09:00-12:00; week 02-52/2 We 09:00-12:00" values_no_i18n="true" />
-    </chunk>
+        <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-Su 09:00-21:00|Mo-Sa 08:00-18:00|Mo-Fr 09:00-17: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 01-53/2 Fr 09:00-12:00; week 02-52/2 We 09:00-12:00" values_no_i18n="true" values_sort="false" />
+    </chunk> <!-- oh -->
+    <chunk id="oh_kitchen">
+        <combo key="opening_hours:kitchen" text="Kitchen Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Su 09:00-21:00|Mo-Sa 08:00-18:00|Mo-Fr 09:00-17: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 01-53/2 Fr 09:00-12:00; week 02-52/2 We 09:00-12:00" values_no_i18n="true" values_sort="false" />
+    </chunk> <!-- oh kitchen -->
+    <chunk id="op_times">
+        <combo key="opening_hours" text="Operation times" delimiter="|" values="24/7|Mo-Fr 22:00-05:00" values_no_i18n="true" values_sort="false" />
+    </chunk> <!-- op times -->
     <chunk id="wheelchair">
-        <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
+        <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" values_sort="false" />
+    </chunk> <!-- cuisine -->
+    <chunk id="oh_kitchen_wheelchair">
+        <reference ref="oh" />
+        <reference ref="oh_kitchen" />
+        <reference ref="wheelchair" />
     </chunk>
     <chunk id="oh_wheelchair">
         <reference ref="oh" />
@@ -168,81 +185,95 @@
     </chunk>
     <chunk id="cuisine">
     <multiselect key="cuisine" text="Cuisine" values="african;american;arab;argentinian;asian;bagel;balkan;barbecue;bavarian;beef_bowl;brazilian;burger;cake;caribbean;chicken;chinese;coffee_shop;crepe;curry;danish;donut;ethiopian;filipino;fish;fish_and_chips;french;friture;frozen_yogurt;german;georgian;greek;heuriger;hot_dog;ice_cream;indian;indonesian;international;italian;japanese;kebab;korean;lebanese;malaysian;mediterranean;mexican;moroccan;noodle;pancake;pasta;persian;peruvian;pizza;polish;portuguese;ramen;regional;russian;sandwich;sausage;seafood;soba;spanish;steak_house;sushi;tex-mex;tapas;thai;turkish;vietnamese;wings" values_searchable="true" />
-    </chunk>
+    </chunk> <!-- cuisine -->
+    <chunk id="reservation">
+        <combo key="reservation" text="Reservation" values="yes,no,required,recommended,members_only" values_sort="false" />
+    </chunk> <!-- reservation -->
+    <chunk id="outdoor_seat_take_delivery">
+            <check key="outdoor_seating" text="Outdoor seating" />
+            <combo key="takeaway" text="Takeaway" values="yes,no,only" values_i18n="false" values_sort="false" />
+            <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" values_i18n="false" values_sort="false" />
+    </chunk> <!-- outdoor seat take delivery -->
     <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>
+        <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" values_sort="false" />
+        <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+    </chunk> <!-- internet -->
     <chunk id="internet_smoking">
-        <reference ref="internet" />
-        <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,outside,no" />
-    </chunk>
+        <reference ref="internet" />
+        <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,outside,no" values_sort="false" />
+    </chunk> <!-- internet smoking -->
+    <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" />
-        </optional>
-    </chunk>
+        <optional>
+            <reference ref="height" />
+        </optional>
+    </chunk> <!-- optional height -->
     <chunk id="optional_maxwidth">
-        <optional>
-            <text key="maxwidth" text="Max. width (meters)" length="7" />
-        </optional>
-    </chunk>
+        <optional>
+            <text key="maxwidth" text="Max. width (meters)" length="7" />
+        </optional>
+    </chunk> <!-- optional maxwidth -->
     <chunk id="optional_maxheight_maxwidth">
-        <optional>
-            <text key="maxheight" text="Max. height (meters)" length="7" />
-            <text key="maxwidth" text="Max. width (meters)" length="7" />
-        </optional>
-    </chunk>
+        <optional>
+            <text key="maxheight" text="Max. height (meters)" length="7" />
+            <text key="maxwidth" text="Max. width (meters)" length="7" />
+        </optional>
+    </chunk> <!-- optional maxheight maxwidth -->
     <chunk id="optional_name">
-        <optional>
-            <text key="name" text="Name" />
-        </optional>
-    </chunk>
+        <optional>
+            <text key="name" text="Name" />
+        </optional>
+    </chunk> <!-- optional name -->
     <chunk id="optional_name_operator">
-        <optional>
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-        </optional>
-    </chunk>
+        <optional>
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+        </optional>
+    </chunk> <!-- optional name operator -->
     <chunk id="name_leisure_pitch">
-        <text key="name" text="Name" />
-        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
-    </chunk>
+        <text key="name" text="Name" />
+        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" values_sort="false" />
+    </chunk> <!-- name leisure pitch -->
     <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>
+        <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> <!-- sport -->
+    <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_no_i18n="true" 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" />
+        <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" values_context="parking" values_sort="false" />
         <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_i18n="false" 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_i18n="false" 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" />
@@ -255,9 +286,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"/>
@@ -268,8 +299,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." />
@@ -278,8 +309,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." />
@@ -287,48 +318,48 @@
         </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" />
+        <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" values_sort="false" />
     </chunk>
     <chunk id="frequency">
-        <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
+        <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" values_sort="false" />
     </chunk>
     <chunk id="voltage_frequency">
         <reference ref="voltage" />
         <reference ref="frequency" />
     </chunk>
     <chunk id="transformer_voltage_frequency">
-        <combo key="voltage:primary" text="Primary voltage in Volts (V)" values="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,20000,15000" />
-        <combo key="voltage:secondary" text="Secondary voltage in Volts (V)" values="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,20000,15000" />
-        <combo key="voltage:tertiary" text="Tertiary voltage in Volts (V)" values="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,20000,15000" />
+        <combo key="voltage:primary" text="Primary voltage in Volts (V)" values="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,20000,15000" values_sort="false" />
+        <combo key="voltage:secondary" text="Secondary voltage in Volts (V)" values="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,20000,15000" values_sort="false" />
+        <combo key="voltage:tertiary" text="Tertiary voltage in Volts (V)" values="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,20000,15000" values_sort="false" />
         <reference ref="frequency" />
     </chunk>
     <chunk id="cables">
@@ -339,7 +370,7 @@
         <combo key="circuits" text="Amount of circuits" values="1,2,3,4" />
     </chunk>
     <chunk id="power_loc">
-        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,roof" values_context="power" />
+        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,roof" values_context="power" values_sort="false" />
     </chunk>
     <chunk id="power_extra">
         <reference ref="power_loc" />
@@ -359,28 +390,28 @@
     </chunk>
     <chunk id="power_output">
         <optional text="Output forms of energy:">
-            <combo key="generator:output:biogas" text="biogas" values="yes,2 W,3 kW,5 MW,7 GW" />
-            <combo key="generator:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
-            <combo key="generator:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" />
-            <combo key="generator:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" />
-            <combo key="generator:output:cold_water" text="cold water" values="yes,2 W,3 kW,5 MW,7 GW" />
-            <combo key="generator:output:cold_air" text="cold air" values="yes,2 W,3 kW,5 MW,7 GW" />
-            <combo key="generator:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" />
-            <combo key="generator:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
-            <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
+            <combo key="generator:output:biogas" text="biogas" values="yes,2 W,3 kW,5 MW,7 GW" values_i18n="false" values_sort="false" />
+            <combo key="generator:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" values_i18n="false" values_sort="false" />
+            <combo key="generator:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" values_i18n="false" values_sort="false" />
+            <combo key="generator:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" values_i18n="false" values_sort="false" />
+            <combo key="generator:output:cold_water" text="cold water" values="yes,2 W,3 kW,5 MW,7 GW" values_i18n="false" values_sort="false" />
+            <combo key="generator:output:cold_air" text="cold air" values="yes,2 W,3 kW,5 MW,7 GW" values_i18n="false" values_sort="false" />
+            <combo key="generator:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" values_i18n="false" values_sort="false" />
+            <combo key="generator:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" values_i18n="false" values_sort="false" />
+            <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" values_i18n="false" values_sort="false" />
             <space />
             <reference ref="voltage_frequency" />
         </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" />
         <reference ref="ref_operator" />
     </chunk>
     <chunk id="rating_phases">
-        <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" />
+        <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" values_i18n="false" values_sort="false" />
         <combo key="phases" text="Phases" values="1,3" length="1" />
     </chunk>
     <chunk id="optional_rating_phases">
@@ -394,11 +425,11 @@
             <combo key="devices" text="Number of devices" values="1,2,3,4" />
             <combo key="windings" text="Number of windings" values="1,2,3,4" />
             <!-- #16364: don't use simple "power" context to avoid conflict with "delta" used for power towers -->
-            <combo key="windings:configuration" text="Windings configuration" values="star,delta,open-delta,zigzag,open,scott,leblanc" values_context="power_windings" />
+            <combo key="windings:configuration" text="Windings configuration" values="star,delta,open-delta,zigzag,open,scott,leblanc" values_context="power_windings" values_sort="false" />
         </optional>
     </chunk>
     <chunk id="telecom_medium">
-        <combo key="telecom:medium" text="Local loop type" values="copper,fibre,coaxial" />
+        <combo key="telecom:medium" text="Local loop type" values="copper,fibre,coaxial" values_sort="false" />
     </chunk>
     <chunk id="optional_bridge">
         <optional>
@@ -411,7 +442,7 @@
             <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
             <space />
             <text key="maxweight" text="Max. weight (tonnes)" />
-            <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+            <reference ref="incline" />
             <text key="width" text="Width (meters)" />
             <check key="toll" text="Toll" />
         </optional>
@@ -430,10 +461,10 @@
     </chunk>
     <chunk id="water_access">
         <optional text="Water access rules:">
-            <combo key="ship" text="Ship" values="yes,designated,destination,delivery,permissive,private,no" />
-            <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,private,no" />
-            <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,private,no" />
-            <combo key="canoe" text="Canoe" values="yes,designated,destination,delivery,permissive,private,no" />
+            <combo key="ship" text="Ship" values="yes,designated,destination,delivery,permissive,private,no" values_sort="false" />
+            <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,private,no" values_sort="false" />
+            <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,private,no" values_sort="false" />
+            <combo key="canoe" text="Canoe" values="yes,designated,destination,delivery,permissive,private,no" values_sort="false" />
         </optional>
     </chunk>
     <chunk id="operator_substance">
@@ -441,7 +472,7 @@
         <combo key="substance" text="Substance" values="water,gas,heat,oil,sewage" />
     </chunk>
     <chunk id="support">
-        <combo key="support" text="Support" values="pole,wall_mounted,billboard,ground" values_context="mounting/support" />
+        <combo key="support" text="Support" values="pole,wall_mounted,billboard,ground" values_context="mounting/support" values_sort="false" />
     </chunk>
     <chunk id="aerodrome">
         <key key="aeroway" value="aerodrome" match="keyvalue" />
@@ -454,84 +485,97 @@
     </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" values_sort="false" />
+        <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" values_sort="false" />
+    </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" values_sort="false" />
+            <combo key="climbing:rock" text="Rock type" rows="3" values="limestone,sandstone,granite,basalt,slate" values_sort="false" />
+            <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" />
+            <reference ref="oh" />
+            <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" values_sort="false" />
+    </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>
   <!--  Groups -->
   <group name="Highways" icon="presets/transport/way/way_secondary.svg">
     <group name="Streets" icon="presets/transport/way/way_secondary.svg">
@@ -546,7 +590,7 @@
                 <text key="destination" text="Destination" />
                 <text key="destination:ref" text="Destination reference" />
                 <text key="width" text="Width (meters)" />
-                <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
+                <reference ref="placement" />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
                     <check key="bridge" text="Bridge" disable_off="true" />
@@ -568,7 +612,7 @@
                 <text key="destination:ref" text="Destination reference" />
                 <text key="junction:ref" text="Junction reference" />
                 <text key="width" text="Width (meters)" />
-                <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
+                <reference ref="placement" />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
                     <check key="bridge" text="Bridge" disable_off="true" />
@@ -592,7 +636,7 @@
                 <text key="destination" text="Destination" />
                 <text key="destination:ref" text="Destination reference" />
                 <text key="width" text="Width (meters)" />
-                <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
+                <reference ref="placement" />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
                     <check key="motorroad" text="Motorroad" default="on" />
@@ -617,7 +661,7 @@
                 <text key="destination:ref" text="Destination reference" />
                 <text key="junction:ref" text="Junction reference" />
                 <text key="width" text="Width (meters)" />
-                <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
+                <reference ref="placement" />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
                     <check key="motorroad" text="Motorroad" default="on" />
@@ -644,7 +688,7 @@
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
                 <check key="narrow" text="Narrow" disable_off="true" />
                 <check key="trolley_wire" text="Overhead trolley wires" />
-                <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
+                <reference ref="placement" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Primary -->
@@ -658,7 +702,7 @@
                 <text key="junction:ref" text="Junction reference" />
                 <check key="motorroad" text="Motorroad" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
-                <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
+                <reference ref="placement" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Primary Link -->
@@ -673,7 +717,7 @@
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
                 <check key="narrow" text="Narrow" disable_off="true" />
                 <check key="trolley_wire" text="Overhead trolley wires" />
-                <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
+                <reference ref="placement" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Secondary -->
@@ -685,7 +729,7 @@
                 <text key="destination" text="Destination" />
                 <text key="destination:ref" text="Destination reference" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
-                <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
+                <reference ref="placement" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Secondary Link -->
@@ -700,7 +744,7 @@
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
                 <check key="narrow" text="Narrow" disable_off="true" />
                 <check key="trolley_wire" text="Overhead trolley wires" />
-                <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
+                <reference ref="placement" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Tertiary -->
@@ -726,7 +770,7 @@
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
                 <check key="narrow" text="Narrow" disable_off="true" />
                 <check key="trolley_wire" text="Overhead trolley wires" />
-                <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
+                <reference ref="placement" />
                 <check key="passing_places" text="Passing Places" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
@@ -747,7 +791,7 @@
                 <reference ref="highway_yesno_incline" />
                 <check key="lit" text="Lit" />
                 <text key="width" text="Width (meters)" />
-                <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
+                <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" values_sort="false" />
                 <check key="narrow" text="Narrow" disable_off="true" />
                 <check key="trolley_wire" text="Overhead trolley wires" />
             </optional>
@@ -758,7 +802,7 @@
             <space />
             <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" />
+            <combo key="highway" text="Highway type" values="residential,service,unclassified,path,cycleway" values_context="Highway" default="residential" values_sort="false" />
             <text key="name" text="Name" />
             <combo key="vehicle" text="Vehicle access" values="yes,no,destination" default="no" />
             <text key="maxspeed" text="Max. speed (km/h)" default="30" />
@@ -771,7 +815,7 @@
                 <reference ref="highway_yesno_incline" />
                 <check key="lit" text="Lit" />
                 <text key="width" text="Width (meters)" />
-                <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
+                <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" values_sort="false" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Bicycle Road -->
@@ -809,7 +853,7 @@
             <link wiki="Tag:highway=service" />
             <space />
             <key key="highway" value="service" />
-            <combo key="service" text="Service way type" values="alley,driveway,parking_aisle,drive-through,emergency_access" />
+            <combo key="service" text="Service way type" values="alley,driveway,parking_aisle,drive-through,emergency_access" values_sort="false" />
             <optional>
                 <text key="name" text="Name" />
                 <reference ref="highway_base" />
@@ -860,13 +904,13 @@
         <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" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
                 <check key="trolley_wire" text="Overhead trolley wires" />
-                <combo key="junction" text="Junction" values="roundabout,jughandle" />
+                <combo key="junction" text="Junction" values="roundabout,jughandle" values_sort="false" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Construction -->
@@ -885,26 +929,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" />
@@ -916,14 +960,14 @@
             <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">
             <link wiki="Tag:junction=roundabout" />
             <space />
             <key key="junction" value="roundabout" />
-            <combo key="highway" text="Type" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" values_context="Highway" />
+            <combo key="highway" text="Type" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" values_context="Highway" values_sort="false" />
             <optional>
                 <reference ref="name_layer" />
                 <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
@@ -934,7 +978,7 @@
         </item> <!-- Roundabout -->
         <item name="Ford" icon="presets/vehicle/ford.svg" type="node,way" preset_name_label="true">
             <link wiki="Tag:ford=yes" />
-            <combo key="ford" text="Ford" values="yes,stepping_stones" default="yes" values_searchable="true" match="keyvalue!" />
+            <combo key="ford" text="Ford" values="yes,stepping_stones" default="yes" values_searchable="true" match="keyvalue!" values_sort="false" />
             <optional>
                 <text key="name" text="Name" />
             </optional>
@@ -958,11 +1002,11 @@
                 <reference ref="highway_yesno_incline_oneway_lit_width" />
                 <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
                 <reference ref="general_access" />
-                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" />
-                <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
-                <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" />
-                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" />
+                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
+                <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
+                <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
+                <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
+                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Track -->
@@ -973,7 +1017,7 @@
                 <reference ref="name_layer" />
                 <reference ref="surface_smoothness" />
                 <reference ref="highway_yesno_incline_oneway_lit_width" />
-                <combo key="sac_scale" text="SAC Scale" values_searchable="true">
+                <combo key="sac_scale" text="SAC Scale" values_searchable="true" values_sort="false">
                     <list_entry value="hiking" display_value="T1 - hiking trail" short_description="Trail well cleared. Area flat or slightly sloped, no fall hazard" />
                     <list_entry value="mountain_hiking" display_value="T2 - mountain hiking trail" short_description="Trail with continuous line and balanced ascent. Terrain partially steep, fall hazard possible" />
                     <list_entry value="demanding_mountain_hiking" display_value="T3 - difficult, exposed hiking trail" short_description="exposed sites may be secured with ropes or chains, possible need to use hands for balance. Partly exposed sites with fall hazard, scree, pathless jagged rocks" />
@@ -983,12 +1027,12 @@
                 </combo>
                 <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
                 <combo key="trail_visibility" text="Visibility" values="excellent,good,intermediate,bad,horrible,no" values_context="trail_visibility" values_sort="false" />
-                <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" />
-                <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,use_sidepath,no" />
-                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" />
-                <combo key="wheelchair" text="Wheelchairs" values="yes,designated,limited,no" />
-                <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="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
+                <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,use_sidepath,no" values_sort="false" />
+                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
+                <combo key="wheelchair" text="Wheelchairs" values="yes,designated,limited,no" values_sort="false" />
+                <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" values_sort="false" />
+                <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
                 <check key="segregated" text="Segregated" />
             </optional>
         </item> <!-- Path -->
@@ -1006,13 +1050,13 @@
         <item name="Cycle Lane/Track" icon="presets/transport/way/cycle_lane_track.svg" type="way,closedway" preset_name_label="true">
             <link wiki="Bicycle" />
             <space />
-            <combo key="cycleway" text="Cycleway" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" />
-            <combo key="cycleway:left" text="Cycleway left" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" />
-            <combo key="cycleway:right" text="Cycleway right" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" />
+            <combo key="cycleway" text="Cycleway" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" values_sort="false" />
+            <combo key="cycleway:left" text="Cycleway left" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" values_sort="false" />
+            <combo key="cycleway:right" text="Cycleway right" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" values_sort="false" />
             <check key="oneway:bicycle" text="Oneway (bicycle)" />
             <space />
             <optional text="Edit Highway Attributes:">
-                <combo key="highway" text="Highway" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" values_context="Highway" />
+                <combo key="highway" text="Highway" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" values_context="Highway" values_sort="false" />
                 <check key="oneway" text="Oneway" />
             </optional>
         </item> <!-- Cycle Lane/Track -->
@@ -1079,8 +1123,8 @@
                     <check key="ramp:stroller" text="Stroller ramp" />
                     <check key="ramp:bicycle" text="Bicycle ramp" />
                 </checkgroup>
-                <combo key="ramp:wheelchair" text="Wheelchair ramp" values="yes,limited,no" />
-                <combo key="ramp:luggage" text="Luggage ramp" values="yes,automatic,manual,no" />
+                <combo key="ramp:wheelchair" text="Wheelchair ramp" values="yes,limited,no" values_sort="false" />
+                <combo key="ramp:luggage" text="Luggage ramp" values="yes,automatic,manual,no" values_sort="false" />
                 <space />
                 <check key="handrail" text="Handrail" />
                 <checkgroup columns="3" >
@@ -1089,7 +1133,7 @@
                     <check key="handrail:right" text="Right handrail" />
                 </checkgroup>
                 <space />
-                <combo key="conveying" text="Escalator" values="yes,forward,backward,reversible" />
+                <combo key="conveying" text="Escalator" values="yes,forward,backward,reversible" values_sort="false" />
                 <space />
                 <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
@@ -1126,16 +1170,17 @@
             <link wiki="Tag:highway=traffic_signals" />
             <key key="highway" value="traffic_signals" />
             <optional>
-                <combo key="traffic_signals:direction" text="Direction" values="forward,backward,both" />
+                <combo key="traffic_signals:direction" text="Direction" values="forward,backward,both" values_sort="false" />
+                <reference ref="op_times" />
             </optional>
             <optional text="Optional crossing attributes:">
-                <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,unmarked,no" />
+                <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,unmarked,no" values_sort="false" />
                 <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
-                <combo key="kerb" text="Kerb" values="flush,lowered,no,raised,rolled,yes" values_context="kerb" />
+                <combo key="kerb" text="Kerb" values="flush,lowered,no,raised,rolled,yes" values_context="kerb" values_sort="false" />
                 <check key="crossing:island" text="With island" />
                 <check key="button_operated" text="Button operated" />
                 <check key="traffic_signals:sound" text="Sound signals" />
-                <combo key="supervised" text="Crossing attendant" 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="supervised" text="Crossing attendant" 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_i18n="false" values_sort="false" />
                 <check key="bicycle" text="Cross by bicycle" />
                 <check key="horse" text="Cross on horseback" />
             </optional>
@@ -1178,14 +1223,15 @@
             </combo>
             <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" values_searchable="true" />
             <combo key="kerb" text="Kerb" values="flush,lowered,no,raised,rolled,yes" values_context="kerb" />
-            <combo key="supervised" text="Crossing attendant" 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="tactile_paving" text="Tactile Paving" values="yes,no,incorrect" />
+            <combo key="supervised" text="Crossing attendant" 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_i18n="false" values_sort="false" />
+            <combo key="tactile_paving" text="Tactile Paving" values="yes,no,incorrect" values_sort="false" />
             <check key="crossing:island" text="With island" />
             <check key="bicycle" text="Cross by bicycle" />
             <check key="horse" text="Cross on horseback" />
             <label text="In case of traffic signals:" />
             <check key="button_operated" text="Button operated" />
             <check key="traffic_signals:sound" text="Sound signals" />
+            <reference ref="op_times" />
         </item> <!-- Pedestrian Crossing -->
         <group name="Traffic Calming" icon="presets/vehicle/choker.svg"> 
             <item name="Bump" icon="presets/vehicle/bump.svg" type="node,way" preset_name_label="true">
@@ -1254,7 +1300,7 @@
             <text key="name" text="Name" />
             <optional>
                 <text key="alt_name" text="Second Name" />
-                <combo key="direction" text="Direction" values="N,E,S,W,0,90,180,270,forward,backward" values_sort="false" />
+                <combo key="direction" text="Direction" values="N,E,S,W,0,90,180,270,forward,backward" values_i18n="false" values_sort="false" />
             </optional>
         </item> <!-- City Limit -->
         <item name="Speed Limit Sign" icon="presets/vehicle/restriction/maxspeed.svg" type="node" preset_name_label="true">
@@ -1263,7 +1309,7 @@
             <key key="traffic_sign" value="maxspeed" />
             <text key="maxspeed" text="Max. speed (km/h)" />
             <optional>
-                <combo key="direction" text="Direction" values="N,E,S,W,0,90,180,270,forward,backward" values_sort="false" />
+                <combo key="direction" text="Direction" values="N,E,S,W,0,90,180,270,forward,backward" values_i18n="false" values_sort="false" />
             </optional>
         </item> <!-- Speed Limit -->
         <item name="Speed Camera" icon="presets/vehicle/restriction/speed_camera.svg" type="node" preset_name_label="true">
@@ -1312,7 +1358,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 -->
@@ -1327,7 +1373,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 -->
@@ -1395,7 +1441,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">
@@ -1403,7 +1449,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">
@@ -1551,7 +1597,7 @@
                 <text key="maxspeed:forward" text="Max. speed in way direction" />
                 <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
                 <space />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+                <reference ref="incline" />
                 <check key="toll" text="Toll" />
             </optional>
         </item> <!-- Tunnel -->
@@ -1563,7 +1609,7 @@
                 <text key="width" text="Width (meters)" />
                 <text key="maxheight" text="Max. height (meters)" />
                 <text key="maxspeed" text="Max. speed (km/h)" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+                <reference ref="incline" />
             </optional>
         </item> <!-- Building Passage -->
         <item name="Arcade" icon="presets/transport/passage/arcade.svg" type="way" preset_name_label="true">
@@ -1597,7 +1643,7 @@
             <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="incline" />
             </optional>
         </item> <!-- Avalanche Protector -->
     </group> <!-- Passageways -->
@@ -1646,7 +1692,7 @@
             <optional>
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
                 <combo key="tunnel" text="Tunnel" values="culvert,flooded,yes" />
-                <combo key="usage" text="Usage" values="transportation,transmission,irrigation,headrace,tailrace,spillway" values_context="usage" />
+                <combo key="usage" text="Usage" values="transportation,transmission,irrigation,headrace,tailrace,spillway" values_context="usage" values_sort="false" />
                 <text key="width" text="Width (meters)" />
                 <text key="wikipedia" text="Wikipedia" />
                 <check key="lock" text="Lock" disable_off="true" />
@@ -1685,7 +1731,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" />
@@ -1735,7 +1781,7 @@
             <optional>
                 <text key="name" text="Name" />
                 <text key="operator" text="Operator" />
-                <combo key="diameter" text="Diameter (mm)" values="800,1000,1200,1500,1600,1800,2200,2300,2400,2500,2600,2800,3200,3300,3400,3500,4000,4200,4300,4800" />
+                <combo key="diameter" text="Diameter (mm)" values="800,1000,1200,1500,1600,1800,2200,2300,2400,2500,2600,2800,3200,3300,3400,3500,4000,4200,4300,4800" values_sort="false" />
                 <text key="pressure" text="Pressure (bar)" />
                 <combo key="material" text="Material" values="metal,steel" />
             </optional>
@@ -1745,7 +1791,7 @@
             <link wiki="Tag:landuse=basin" />
             <space />
             <key key="landuse" value="basin" />
-            <combo key="basin" text="Type" values="retention,infiltration,detention" />
+            <combo key="basin" text="Type" values="retention,infiltration,detention" values_sort="false" />
             <reference ref="optional_name" />
         </item> <!-- Basin -->
         <item name="Reservoir" icon="presets/landuse/reservoir.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -1772,7 +1818,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 -->
@@ -1817,7 +1863,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" />
@@ -1865,7 +1911,7 @@
                 <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" />
                 <reference ref="fee" />
-                <combo key="ferry" text="Highway type the ferry connects" values="trunk,primary,secondary,tertiary,unclassified" values_context="Highway" />
+                <combo key="ferry" text="Highway type the ferry connects" values="trunk,primary,secondary,tertiary,unclassified" values_context="Highway" values_sort="false" />
                 <check key="ferry:cable" text="Reaction ferry" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
@@ -1876,7 +1922,7 @@
             <space />
             <key key="leisure" value="marina" />
             <text key="name" text="Name" />
-            <combo key="sanitary_dump_station" text="Dump Station" values="yes,public,customers,no" />
+            <combo key="sanitary_dump_station" text="Dump Station" values="yes,public,customers,no" values_sort="false" />
         </item> <!-- Marina -->
         <item name="Marine Fuel" icon="presets/nautical/marine_fuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:waterway=fuel"/>
@@ -1912,7 +1958,7 @@
             <space />
             <key key="man_made" value="pier" />
             <text key="name" text="Name" />
-            <combo key="mooring" text="Mooring" values="yes,no,private,commercial" />
+            <combo key="mooring" text="Mooring" values="yes,no,private,commercial" values_sort="false" />
             <check key="floating" text="Floating" />
         </item> <!-- Pier -->
         <item name="Lock Gate" icon="presets/nautical/lock_gate.svg" type="node,way" preset_name_label="true">
@@ -1951,7 +1997,7 @@
             <link wiki="Tag:railway=rail" />
             <key key="railway" value="rail" />
             <optional>
-                <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
+                <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" values_sort="false" />
                 <reference ref="railway_service_gauge_electrified_yesno" />
             </optional>
         </item> <!-- Rail -->
@@ -1959,7 +2005,7 @@
             <link wiki="Tag:railway=narrow_gauge" />
             <key key="railway" value="narrow_gauge" />
             <optional>
-                <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
+                <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" values_sort="false" />
                 <reference ref="railway_service_gauge_electrified_yesno" />
             </optional>
         </item> <!-- Narrow Gauge Rail -->
@@ -2023,9 +2069,9 @@
         <item name="Railway construction" icon="presets/transport/railway/railway_construction.svg" type="way" preset_name_label="true">
             <link wiki="Key:construction" />
             <key key="railway" value="construction" />
-            <combo key="construction" text="Railway type" values="rail,narrow_gauge,monorail,preserved,light_rail,subway,tram,funicular" />
+            <combo key="construction" text="Railway type" values="rail,narrow_gauge,monorail,preserved,light_rail,subway,tram,funicular" values_sort="false" />
             <optional>
-                <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
+                <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" values_sort="false" />
                 <reference ref="railway_service_gauge_electrified_yesno" />
             </optional>
         </item> <!-- Railway construction -->
@@ -2053,7 +2099,7 @@
                 <reference ref="supervised" />
                 <check key="crossing:light" text="Traffic lights" />
                 <check key="crossing:bell" text="Sound signals" />
-                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
+                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" values_sort="false" />
             </optional>
         </item> <!-- Level Crossing -->
         <item name="Crossing" icon="presets/transport/railway/crossing.svg" type="node" preset_name_label="true">
@@ -2066,7 +2112,7 @@
                 <check key="bicycle" text="Cross by bicycle" />
                 <check key="crossing:light" text="Traffic lights" />
                 <check key="crossing:bell" text="Sound signals" />
-                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
+                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" values_sort="false" />
             </optional>
         </item> <!-- Crossing -->
         <item name="Turntable" icon="presets/transport/railway/turntable.svg" type="node,closedway" preset_name_label="true">
@@ -2217,13 +2263,13 @@
             <key key="amenity" value="parking" />
             <reference ref="parking_name_type_ref" />
             <text key="maxheight" text="Max. height (meters)" />
-            <combo key="park_ride" text="Park and Ride" values="yes,no,bus,train,tram,metro,ferry" />
+            <combo key="park_ride" text="Park and Ride" values="yes,no,bus,train,tram,metro,ferry" values_sort="false" />
             <reference ref="parking_access_fee_operator_surface_smoothness" />
             <space />
             <text key="capacity" text="Capacity (overall)" />
-            <combo key="capacity:disabled" text="Spaces for Disabled" values="yes,no,1,2,3" />
-            <combo key="capacity:women" text="Spaces for Women" values="yes,no,1,2,3" />
-            <combo key="capacity:parent" text="Spaces for Parents" values="yes,no,1,2,3" />
+            <combo key="capacity:disabled" text="Spaces for Disabled" values="yes,no,1,2,3" values_sort="false" />
+            <combo key="capacity:women" text="Spaces for Women" values="yes,no,1,2,3" values_sort="false" />
+            <combo key="capacity:parent" text="Spaces for Parents" values="yes,no,1,2,3" values_sort="false" />
             <label text="See the Wiki for other capacity:[types]=*." />
             <space />
             <reference ref="maxstay" />
@@ -2260,7 +2306,7 @@
                 <text key="name" text="Name" />
                 <text key="operator" text="Operator" />
                 <reference ref="oh_wheelchair" />
-                <combo key="shop" text="With shop" values="yes,convenience,kiosk,no" />
+                <combo key="shop" text="With shop" values="yes,convenience,kiosk,no" values_sort="false" />
                 <space />
                 <label text="Fuel types:" />
                 <checkgroup columns="2">
@@ -2359,7 +2405,7 @@
             <key key="shop" value="car" />
             <reference ref="car_brands" />
             <reference ref="name_operator_oh_wheelchair" />
-            <combo key="second_hand" text="Second hand" values="yes,no,only" />
+            <combo key="second_hand" text="Second hand" values="yes,no,only" values_sort="false" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Car Dealer -->
         <item name="Repair" icon="presets/vehicle/repair_shop.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -2433,14 +2479,14 @@
             <reference ref="motorcycle_brands" />
             <text key="operator" text="Operator" />
             <reference ref="oh_wheelchair" />
-            <combo key="second_hand" text="Second hand" values="yes,no,only" />
+            <combo key="second_hand" text="Second hand" values="yes,no,only" values_sort="false" />
             <optional text="Services:">
-                <combo key="sale" text="Sale" values="yes,brand,no" />
-                <combo key="rental" text="Rental" values="yes,brand,no" />
-                <combo key="repair" text="Repair" values="yes,brand,oldtimer,no" />
-                <combo key="safety_inspection" text="Safety inspection" values="yes,DEKRA,GTÜ,MOT,TÜV,no" />
-                <combo key="parts" text="Parts" values="yes,brand,oldtimer,no" />
-                <combo key="clothes" text="Clothes" values="yes,brand,no" />
+                <combo key="sale" text="Sale" values="yes,brand,no" values_sort="false" />
+                <combo key="rental" text="Rental" values="yes,brand,no" values_sort="false" />
+                <combo key="repair" text="Repair" values="yes,brand,oldtimer,no" values_sort="false" />
+                <combo key="safety_inspection" text="Safety inspection" values="yes,DEKRA,GTÜ,MOT,TÜV,no" values_i18n="false" values_sort="false" />
+                <combo key="parts" text="Parts" values="yes,brand,oldtimer,no" values_sort="false" />
+                <combo key="clothes" text="Clothes" values="yes,brand,no" values_sort="false" />
                 <text key="services" text="Other" />
             </optional>
             <reference ref="link_contact_address_payment" />
@@ -2498,7 +2544,7 @@
             <link wiki="Public_transport#Service_routes" />
             <space />
             <key key="type" value="route" />
-            <combo key="route" text="Route type" values="train,subway,monorail,tram,light_rail" values_searchable="true" match="keyvalue!" />
+            <combo key="route" text="Route type" values="train,subway,monorail,tram,light_rail" values_searchable="true" values_sort="false" match="keyvalue!" />
             <key key="public_transport:version" value="2" /> <!-- only validate marked relations in order to avoid false positives -->
             <reference ref="name_ref" />
             <optional>
@@ -2539,7 +2585,7 @@
             <link wiki="Public_transport#Route_Master_relations" />
             <space />
             <key key="type" value="route_master" />
-            <combo key="route_master" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,share_taxi,aerialway,ferry" />
+            <combo key="route_master" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,share_taxi,aerialway,ferry" values_sort="false" />
             <reference ref="name_ref" />
             <optional>
                 <text key="operator" text="Operator" />
@@ -2644,7 +2690,7 @@
     <group name="Public Transport (Legacy)" icon="presets/transport/bus_old.svg">
         <item name="Public transport route (Legacy)" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
             <key key="type" value="route" />
-            <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,share_taxi,aerialway,ferry" values_searchable="true" match="keyvalue!" />
+            <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,share_taxi,aerialway,ferry" values_searchable="true" values_sort="false" match="keyvalue!" />
             <key key="public_transport:version" value="1" /> <!-- only validate marked relations in order to avoid false positives -->
             <reference ref="name_ref" />
             <optional>
@@ -2785,7 +2831,7 @@
         <item name="Hangar" icon="presets/transport/airport/hangar.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:aeroway=hangar" />
             <key key="aeroway" value="hangar" />
-            <combo key="building" text="Building" values="hangar,yes" values_context="building" default="hangar" values_searchable="true" />
+            <combo key="building" text="Building" values="hangar,yes" values_context="building" default="hangar" values_searchable="true" values_sort="false" />
         </item> <!-- Hangar -->
         <item name="Beacon" icon="presets/transport/airport/airmark_beacon.svg" name_context="airmark" type="node" preset_name_label="true">
             <link wiki="Tag:airmark=beacon" />
@@ -2794,7 +2840,7 @@
         <item name="Navigation aid" icon="presets/transport/airport/navigationaid.svg" type="node" preset_name_label="true">
             <link wiki="Tag:aeroway=navigationaid" />
             <key key="aeroway" value="navigationaid" />
-            <combo key="navigationaid" text="Type" values_searchable="true">
+            <combo key="navigationaid" text="Type" values_searchable="true" values_sort="false">
                 <list_entry value="als" icon="presets/transport/airport/navigationaid.svg" short_description="Approach lighting system" />
                 <list_entry value="papi" icon="presets/transport/airport/papi.svg" short_description="Precision approach path indicator" />
                 <list_entry value="vasi" icon="presets/transport/airport/vasi.svg" short_description="Visual approach slope indicator" />
@@ -2831,7 +2877,9 @@
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
             <text key="rooms" text="Rooms" />
             <text key="beds" text="Beds" />
-            <reference ref="wheelchair" />
+            <reference ref="cuisine" />
+            <reference ref="oh_kitchen_wheelchair" />
+            <reference ref="reservation" />
             <space />
             <reference ref="internet_smoking" />
             <space />
@@ -2846,7 +2894,8 @@
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
             <text key="rooms" text="Rooms" />
             <text key="beds" text="Beds" />
-            <reference ref="wheelchair" />
+            <reference ref="oh_wheelchair" />
+            <reference ref="reservation" />
             <space />
             <reference ref="internet_smoking" />
             <space />
@@ -2862,7 +2911,9 @@
             <text key="rooms" text="Rooms" />
             <text key="beds" text="Beds" />
             <combo key="guest_house" text="Type" values="agritourism,bed_and_breakfast" />
-            <reference ref="wheelchair" />
+            <reference ref="cuisine" />
+            <reference ref="oh_kitchen_wheelchair" />
+            <reference ref="reservation" />
             <space />
             <reference ref="internet_smoking" />
             <space />
@@ -2876,7 +2927,8 @@
             <reference ref="name_operator" />
             <combo key="number_of_apartments" text="Number of apartments" values="1,2,3,4,5,6,7,8,9,10" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
-            <reference ref="wheelchair" />
+            <reference ref="oh_wheelchair" />
+            <reference ref="reservation" />
             <space />
             <reference ref="internet_smoking" />
             <space />
@@ -2890,7 +2942,8 @@
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
             <text key="rooms" text="Rooms" />
             <text key="beds" text="Beds" />
-            <reference ref="wheelchair" />
+            <reference ref="oh_wheelchair" />
+            <reference ref="reservation" />
             <space />
             <reference ref="internet_smoking" />
             <space />
@@ -2905,7 +2958,8 @@
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
             <text key="rooms" text="Rooms" />
             <text key="beds" text="Beds" />
-            <reference ref="wheelchair" />
+            <reference ref="oh_wheelchair" />
+            <reference ref="reservation" />
             <space />
             <reference ref="internet_smoking" />
             <space />
@@ -2917,10 +2971,13 @@
             <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" />
+            <reference ref="reservation" />
+            <reference ref="oh" />
+            <reference ref="oh_kitchen" />
+            <reference ref="cuisine" />
             <space />
             <reference ref="internet_smoking" />
             <space />
@@ -2932,14 +2989,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="reservation" />
+            <reference ref="ele" />
             <text key="description" text="Closer description" />
             <space />
             <reference ref="link_contact_address_payment" />
@@ -2952,10 +3009,10 @@
             <key key="tourism" value="caravan_site" />
             <reference ref="name_operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5" />
-            <reference ref="wheelchair" />
+            <reference ref="oh_wheelchair" />
+            <reference ref="reservation" />
             <space />
             <text key="capacity" text="Number of places" />
-            <reference ref="fee_interval" />
             <combo key="sanitary_dump_station" text="Dump Station" values="yes,public,customers,no" />
             <check key="power_supply" text="Power supply" />
             <check key="tents" text="Tents allowed" />
@@ -2979,7 +3036,10 @@
                 <check key="group_only" text="Group only access" />
             </checkgroup>
             <combo key="sanitary_dump_station" text="Dump Station" values="yes,public,customers,no" />
-            <reference ref="wheelchair" />
+            <reference ref="oh_wheelchair" />
+            <text key="capacity" text="Number of places" />
+            <reference ref="fee_interval" />
+            <reference ref="reservation" />
             <reference ref="internet" />
             <space />
             <reference ref="nudism" />
@@ -2992,6 +3052,8 @@
             <text key="ref" text="Reference" />
             <text key="addr:unit" text="Unit number" />
             <text key="capacity" text="Number of places" />
+            <reference ref="fee_interval" />
+            <reference ref="reservation" />
             <reference ref="surface" />
             <checkgroup columns="2">
                 <check key="tents" text="Tents allowed" />
@@ -3010,13 +3072,9 @@
             <reference ref="name_operator" />
             <reference ref="cuisine" />
             <check key="microbrewery" text="Microbrewery" />
-            <check key="outdoor_seating" text="Outdoor seating" />
-            <combo key="takeaway" text="Takeaway" values="yes,no,only" />
-            <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" />
-            <combo key="reservation" text="Reservation" values="yes,no,required,recommended,members_only" />
-            <reference ref="oh" />
-            <combo key="opening_hours:kitchen" text="Kitchen Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Su 09:00-21:00|Mo-Sa 08:00-18:00|Mo-Fr 09:00-17: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 01-53/2 Fr 09:00-12:00; week 02-52/2 We 09:00-12:00" values_no_i18n="true" />
-            <reference ref="wheelchair" />
+            <reference ref="outdoor_seat_take_delivery" />
+            <reference ref="reservation" />
+            <reference ref="oh_kitchen_wheelchair" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
             <space />
             <reference ref="internet_smoking" />
@@ -3030,10 +3088,7 @@
             <key key="amenity" value="fast_food" />
             <reference ref="name_operator" />
             <reference ref="cuisine" />
-            <check key="outdoor_seating" text="Outdoor seating" />
-            <combo key="takeaway" text="Takeaway" values="yes,no,only" />
-            <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" />
-            <reference ref="oh_wheelchair" />
+            <reference ref="outdoor_seat_take_delivery" />
             <space />
             <reference ref="internet_smoking" />
             <space />
@@ -3046,7 +3101,8 @@
             <space />
             <key key="amenity" value="food_court" />
             <reference ref="name_operator" />
-            <check key="outdoor_seating" text="Outdoor seating" />
+            <reference ref="cuisine" />
+            <reference ref="outdoor_seat_take_delivery" />
             <reference ref="oh_wheelchair" />
             <space />
             <reference ref="internet_smoking" />
@@ -3059,9 +3115,8 @@
             <key key="amenity" value="cafe" />
             <reference ref="name_operator" />
             <combo key="cuisine" text="Cuisine" values="ice_cream" />
-            <check key="outdoor_seating" text="Outdoor seating" />
-            <combo key="takeaway" text="Takeaway" values="yes,no,only" />
-            <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" />
+            <reference ref="outdoor_seat_take_delivery" />
+            <reference ref="reservation" />
             <reference ref="oh_wheelchair" />
             <space />
             <reference ref="internet_smoking" />
@@ -3074,9 +3129,7 @@
             <space />
             <key key="amenity" value="ice_cream" />
             <reference ref="name_operator" />
-            <check key="outdoor_seating" text="Outdoor seating" />
-            <combo key="takeaway" text="Takeaway" values="yes,no,only" />
-            <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" />
+            <reference ref="outdoor_seat_take_delivery" />
             <reference ref="oh_wheelchair" />
             <space />
             <reference ref="internet_smoking" />
@@ -3090,10 +3143,8 @@
             <key key="amenity" value="pub" />
             <reference ref="name_operator" />
             <check key="microbrewery" text="Microbrewery" />
-            <check key="outdoor_seating" text="Outdoor seating" />
-            <combo key="takeaway" text="Takeaway" values="yes,no,only" />
-            <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" />
-            <reference ref="oh_wheelchair" />
+            <reference ref="outdoor_seat_take_delivery" />
+            <reference ref="oh_kitchen_wheelchair" />
             <space />
             <reference ref="internet_smoking" />
             <space />
@@ -3106,7 +3157,7 @@
             <key key="amenity" value="biergarten" />
             <reference ref="name_operator" />
             <check key="microbrewery" text="Microbrewery" />
-            <reference ref="oh_wheelchair" />
+            <reference ref="oh_kitchen_wheelchair" />
             <space />
             <reference ref="internet_smoking" />
             <space />
@@ -3130,20 +3181,20 @@
         <item name="Diet" icon="presets/food/diet.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Key:diet" />
             <space />
-            <combo key="diet:vegetarian" text="Vegetarian" values="yes,no,only" />
-            <combo key="diet:vegan" text="Vegan" values="yes,no,only" />
-            <combo key="diet:lacto_vegetarian" text="Lacto-vegetarian" values="yes,no,only" />
-            <combo key="diet:ovo_vegetarian" text="Ovo-vegetarian" values="yes,no,only" />
-            <combo key="diet:pescetarian" text="Pescetarian" values="yes,no,only" />
-            <combo key="diet:fruitarian" text="Fruitarian" values="yes,no,only" />
-            <combo key="diet:raw" text="Raw" values="yes,no,only" />
-            <space />
-            <combo key="diet:dairy_free" text="Dairy free" values="yes,no,only" />
-            <combo key="diet:gluten_free" text="Gluten free" values="yes,no,only" />
-            <combo key="diet:lactose_free" text="Lactose free" values="yes,no,only" />
+            <combo key="diet:vegetarian" text="Vegetarian" values="yes,no,only" values_sort="false" />
+            <combo key="diet:vegan" text="Vegan" values="yes,no,only" values_sort="false" />
+            <combo key="diet:lacto_vegetarian" text="Lacto-vegetarian" values="yes,no,only" values_sort="false" />
+            <combo key="diet:ovo_vegetarian" text="Ovo-vegetarian" values="yes,no,only" values_sort="false" />
+            <combo key="diet:pescetarian" text="Pescetarian" values="yes,no,only" values_sort="false" />
+            <combo key="diet:fruitarian" text="Fruitarian" values="yes,no,only" values_sort="false" />
+            <combo key="diet:raw" text="Raw" values="yes,no,only" values_sort="false" />
+            <space />
+            <combo key="diet:dairy_free" text="Dairy free" values="yes,no,only" values_sort="false" />
+            <combo key="diet:gluten_free" text="Gluten free" values="yes,no,only" values_sort="false" />
+            <combo key="diet:lactose_free" text="Lactose free" values="yes,no,only" values_sort="false" />
             <space />
-            <combo key="diet:halal" text="Halal" values="yes,no,only" />
-            <combo key="diet:kosher" text="Kosher" values="yes,no,only" />
+            <combo key="diet:halal" text="Halal" values="yes,no,only" values_sort="false" />
+            <combo key="diet:kosher" text="Kosher" values="yes,no,only" values_sort="false" />
         </item> <!-- Diet -->
     </group> <!-- Food+Drinks -->
     <group name="Tourism" icon="presets/sightseeing/attraction.svg">
@@ -3152,7 +3203,7 @@
             <space />
             <key key="tourism" value="attraction" />
             <text key="name" text="Name" />
-            <combo key="reservation" text="Reservation" values="yes,no,required,recommended,members_only" />
+            <reference ref="reservation" />
             <reference ref="oh_wheelchair" />
         </item> <!-- Attraction -->
         <item name="Viewpoint" icon="presets/sightseeing/viewpoint.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -3183,7 +3234,7 @@
             <key key="tourism" value="information" />
             <key key="information" value="map" />
             <text key="name" text="Name" />
-            <combo key="map_type" text="Detail Grade" values="topo,street,scheme,toposcope" />
+            <combo key="map_type" text="Detail Grade" values="topo,street,scheme,toposcope" values_sort="false" />
             <combo key="map_size" text="Shown Area" values="site,city,region" values_sort="false" />
             <text key="description" text="Closer description" />
             <optional text="Routes shown for:">
@@ -3213,7 +3264,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" />
@@ -3296,7 +3347,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" />
@@ -3365,7 +3416,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" />
@@ -3388,7 +3439,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 -->
@@ -3860,7 +3911,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>
@@ -4043,7 +4094,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" />
@@ -4063,7 +4114,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" />
@@ -4228,10 +4279,10 @@
             <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" />
+            <reference ref="op_times" />
         </item> <!-- Sanitary Dump Station -->
         <separator/>
         <item name="Bench" icon="presets/leisure/bench.svg" type="node,way" preset_name_label="true">
@@ -4262,7 +4313,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" />
@@ -4301,8 +4352,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 -->
@@ -4506,7 +4556,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" />
@@ -4879,7 +4929,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 -->
@@ -4890,7 +4940,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 -->
@@ -4899,9 +4949,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">
@@ -4916,7 +4966,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" />
@@ -4964,7 +5014,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" />
@@ -4986,7 +5036,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">
@@ -4996,7 +5046,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">
@@ -5006,7 +5056,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">
@@ -5102,7 +5152,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">
@@ -5160,7 +5210,7 @@
             <key key="highway" value="street_lamp" />
             <combo key="lamp_type" text="Type" values="electric,floodlight,sodium,solar_lamp" values_context="lamp_type" match="key" />
             <combo key="lamp_mount" text="Mounted on" values="bent_mast,straight_mast,suspended,wall" values_context="lamp_mount" match="key" />
-            <combo key="opening_hours" text="Operation times" values="Mo-Fr 22:00-05:00" values_no_i18n="true" />
+            <reference ref="op_times" />
         </item> <!-- Street Lamp -->
         <item name="Street cabinet" icon="presets/misc/street_cabinet.svg" type="node" preset_name_label="true">
             <link wiki="Tag:man_made=street_cabinet" />
@@ -5208,9 +5258,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">
@@ -5233,7 +5282,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 -->
@@ -5575,7 +5624,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 -->
@@ -5593,7 +5642,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" />
@@ -5605,7 +5654,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" />
@@ -7137,7 +7186,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" />
@@ -7145,7 +7194,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" />
@@ -7153,7 +7202,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" />
@@ -7161,7 +7210,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" />
@@ -7173,7 +7222,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" />
@@ -7188,7 +7237,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" />
@@ -7197,7 +7246,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/>
@@ -7238,7 +7287,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 />
@@ -7254,7 +7303,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" name_context="natural" preset_name_label="true">
@@ -7362,7 +7411,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 -->
@@ -7642,6 +7691,8 @@
             <space />
             <text key="wikipedia" text="Wikipedia" />
             <text key="image" text="Image" />
+            <space />
+            <preset_link preset_name="Contact (Schema with 'contact:*' Prefix)" text="Similar tags but different tagging scheme" text_context="Contact" />
         </item> <!-- Contact (Common Schema) -->
         <item name="Contact (Schema with 'contact:*' Prefix)" icon="presets/misc/contact.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Key:contact" />
@@ -7655,6 +7706,8 @@
             <space />
             <text key="wikipedia" text="Wikipedia" />
             <text key="image" text="Image" />
+            <space />
+            <preset_link preset_name="Contact (Common Schema)" text="Similar tags but different tagging scheme" text_context="Contact" />
         </item> <!-- Contact (Schema with 'contact:*' Prefix) -->
         <item name="Description" icon="presets/misc/description.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Key:description" />
@@ -8075,7 +8128,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>