Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 16455)
+++ trunk/resources/data/defaultpresets.xml	(revision 16474)
@@ -59,5 +59,5 @@
     <chunk id="highway_yesno_incline">
         <reference ref="highway_yesno" />
-        <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down"/>
+        <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
     </chunk>
     <chunk id="highway_yesno_incline_oneway_lit_width">
@@ -139,5 +139,5 @@
     </chunk>
     <chunk id="oh">
-        <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-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" />
+        <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>
     <chunk id="wheelchair">
@@ -216,5 +216,5 @@
     </chunk>
     <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" />
+        <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>
     <chunk id="parking_name_type_ref">
@@ -225,5 +225,5 @@
     <chunk id="parking_access_fee_operator_surface_smoothness">
         <space />
-        <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
+        <reference ref="POI_access" />
         <reference ref="fee_interval" />
         <text key="operator" text="Operator" />
@@ -234,13 +234,16 @@
     </chunk>
     <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" />
+        <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>
     <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 id="highway_access">
+        <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" />
+    </chunk>
+    <chunk id="POI_access">
+        <combo key="access" text="General Access" values="yes,private,customers,permissive,no" />
     </chunk>
     <chunk id="name_wikipedia">
@@ -256,5 +259,5 @@
         <text key="ref" text="Reference" />
         <text key="operator" text="Operator" />
-        <text key="distance" text="Distance (km)"/>
+        <text key="distance" text="Distance (kilometers)"/>
         <text key="ascent" text="Ascent (m)"/>
         <text key="descent" text="Descent (m)"/>
@@ -374,5 +377,5 @@
     </chunk>
     <chunk id="power_pole">
-        <text key="height" text="Height (meters)" />
+        <text key="height" text="Height (meters)" length="7" />
         <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" />
@@ -522,14 +525,8 @@
       <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="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" values_sort="false" />
       <combo key="fee" text="Fee" values="yes,no,Sa-Su 08:00-20:00"/>
-      <combo key="access" text="Access" values="yes,no,customers,private" />
+      <reference ref="POI_access" />
     </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>
   <!--  Groups -->
@@ -958,5 +955,5 @@
                 <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" />
+                <reference ref="highway_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" />
@@ -974,5 +971,5 @@
                 <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" />
@@ -1013,5 +1010,5 @@
             <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,secondary_link,tertiary,tertiary_link,unclassified,residential,living_street,service,bus_guideway,construction" values_context="Highway" values_sort="false" />
                 <check key="oneway" text="Oneway" />
             </optional>
@@ -1136,5 +1133,5 @@
                 <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" />
@@ -1179,5 +1176,5 @@
             <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="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" />
             <check key="crossing:island" text="With island" />
@@ -1313,5 +1310,5 @@
                 <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="POI_access" />
                 <combo key="surveillance" text="Surveillance Camera" values="indoor,outdoor" />
             </optional>
@@ -1328,5 +1325,5 @@
             <optional>
                 <text key="name" text="Name" />
-                <text key="ele" text="Elevation" />
+                <text key="ele" text="Elevation (meters)" lenght="10" />
                 <text key="wikipedia" text="Wikipedia" />
             </optional>
@@ -1430,5 +1427,5 @@
             <reference ref="optional_height" />
             <combo key="wall" text="Type" values="castle_wall,dry_stone,flood_wall,noise_barrier,seawall" values_searchable="true" />
-            <reference ref="wall_material" />
+            <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
         </item> <!-- Wall -->
         <item name="City Wall" icon="presets/barrier/city_wall.svg" type="way,closedway,multipolygon" preset_name_label="true">
@@ -1436,5 +1433,5 @@
             <key key="barrier" value="city_wall" />
             <reference ref="optional_height" />
-            <reference ref="wall_material" />
+            <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
         </item> <!-- City Wall -->
         <item name="Retaining Wall" icon="presets/barrier/retaining_wall.svg" type="way,closedway" preset_name_label="true">
@@ -1442,5 +1439,5 @@
             <key key="barrier" value="retaining_wall" />
             <reference ref="optional_height" />
-            <reference ref="wall_material" />
+            <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
         </item> <!-- Retaining Wall -->
         <item name="Jersey Barrier" icon="presets/barrier/jersey_barrier.svg"  type="node,way,closedway" preset_name_label="true">
@@ -1475,5 +1472,5 @@
             <reference ref="barrier_5" />
             <reference ref="optional_maxheight_maxwidth" />
-            <reference ref="general_access" />
+            <reference ref="highway_access" />
         </item> <!-- Gate -->
         <item name="Lift Gate" icon="presets/barrier/lift_gate.svg" type="node" preset_name_label="true">
@@ -1482,5 +1479,5 @@
             <reference ref="barrier_5" />
             <reference ref="optional_maxwidth" />
-            <reference ref="general_access" />
+            <reference ref="highway_access" />
         </item> <!-- Lift Gate -->
         <item name="Swing Gate" icon="presets/barrier/swing_gate.svg" type="node" preset_name_label="true">
@@ -1490,5 +1487,5 @@
             <reference ref="barrier_5" />
             <reference ref="optional_maxwidth" />
-            <reference ref="general_access" />
+            <reference ref="highway_access" />
         </item> <!-- Swing Gate -->
         <item name="Hampshire Gate" type="node" preset_name_label="true">
@@ -1686,5 +1683,5 @@
             <key key="waterway" value="waterfall" />
             <reference ref="name_wikipedia" />
-            <text key="height" text="Height (meters)" />
+            <text key="height" text="Height (meters)" length="7" />
         </item> <!-- Waterfall -->
         <item name="Weir" icon="presets/nautical/weir.svg" type="node,way" preset_name_label="true">
@@ -1773,5 +1770,5 @@
             <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" />
+            <text key="ele" text="Elevation (meters)" lenght="10" />
             <text key="wikipedia" text="Wikipedia" />
             <reference ref="water_access" />
@@ -1818,8 +1815,8 @@
                 <reference ref="supervised" />
                 <reference ref="oh_wheelchair" />
-                <reference ref="general_access" />
+                <reference ref="POI_access" />
                 <combo key="surface" text="Surface" values="gravel,pebblestone,sand" />
                 <combo key="sport" text="Sport" values="swimming,surfing" />
-                <reference ref="nudism" />
+                <combo key="nudism" text="Nudism" values="yes,no,obligatory,designated,customary,permissive" />
             </optional>
         </item> <!-- Beach -->
@@ -1866,5 +1863,5 @@
                 <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>
@@ -2922,5 +2919,5 @@
             <key key="tourism" value="alpine_hut" />
             <reference ref="name_operator" />
-            <text key="ele" text="Elevation" />
+            <text key="ele" text="Elevation (meters)" lenght="10" />
             <text key="rooms" text="Rooms" />
             <text key="beds" text="Beds" />
@@ -2937,5 +2934,5 @@
             <key key="tourism" value="wilderness_hut" />
             <reference ref="name_operator" />
-            <combo key="access" text="Access rights" values="yes,permissive,customers,private" />
+            <reference ref="POI_access" />
             <text key="capacity" text="Capacity" />
             <reference ref="fee" />
@@ -2944,5 +2941,5 @@
             <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" />
+            <text key="ele" text="Elevation (meters)" lenght="10" />
             <text key="description" text="Closer description" />
             <space />
@@ -2957,6 +2954,6 @@
             <reference ref="name_operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5" />
-            <reference ref="wheelchair" />
-            <space />
+            <reference ref="oh_wheelchair" />
+            <combo key="reservation" text="Reservation" values="yes,no,required,recommended,members_only" />
             <text key="capacity" text="Number of places" />
             <reference ref="fee_interval" />
@@ -2975,4 +2972,7 @@
             <reference ref="name_operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5" />
+            <reference ref="oh_wheelchair" />
+            <combo key="reservation" text="Reservation" values="yes,no,required,recommended,members_only" />
+            <text key="capacity" text="Number of places" />
             <checkgroup columns="2">
                 <check key="tents" text="Tents allowed" />
@@ -2987,5 +2987,5 @@
             <reference ref="internet" />
             <space />
-            <reference ref="nudism" />
+            <combo key="nudism" text="Nudism" values="yes,no,obligatory,designated,customary,permissive" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Campsite -->
@@ -3020,5 +3020,5 @@
             <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" />
+            <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" />
             <reference ref="wheelchair" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
@@ -3218,5 +3218,5 @@
             <key key="information" value="guidepost" />
             <reference ref="name_ref_operator" />
-            <text key="ele" text="Elevation" />
+            <text key="ele" text="Elevation (meters)" lenght="10" />
             <optional text="Routes shown for:">
                 <check key="hiking" text="Hiking" />
@@ -3235,5 +3235,5 @@
             <key key="information" value="route_marker" />
             <reference ref="name_ref_operator" />
-            <text key="ele" text="Elevation" />
+            <text key="ele" text="Elevation (meters)" lenght="10" />
             <optional text="Routes shown for:">
                 <check key="hiking" text="Hiking" />
@@ -3301,5 +3301,5 @@
             <key key="leisure" value="bandstand" />
             <reference ref="name_operator_oh_wheelchair" />
-            <combo key="access" text="Access" values="yes,permissive,private" />
+            <reference ref="POI_access" />
         </item> <!-- Bandstand -->
         <item name="Zoo" icon="presets/leisure/zoo.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -3361,5 +3361,5 @@
             <reference ref="fee_interval" />
             <space />
-            <reference ref="nudism" />
+            <combo key="nudism" text="Nudism" values="yes,no,obligatory,designated,customary,permissive" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Beach Resort -->
@@ -3370,5 +3370,5 @@
             <label text="Used for the water area only." />
             <space />
-            <combo key="access" text="Access" values="yes,customers,private" />
+            <reference ref="POI_access" />
         </item> <!-- Swimming Pool -->
         <item name="Dive centre" icon="presets/leisure/dive_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -3393,5 +3393,5 @@
             <key key="leisure" value="sauna" />
             <reference ref="name_operator_oh_wheelchair" />
-            <combo key="access" text="Access" values="yes,permissive,private" />
+            <reference ref="POI_access" />
             <space />
             <reference ref="link_contact_address_payment" />
@@ -3877,5 +3877,5 @@
             <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="POI_access" />
             <check key="indoor" text="Located inside a building?" />
             <!-- lastcheck is in use for aed devices, but not yet well discussed or documented
@@ -4060,5 +4060,5 @@
             <key key="amenity" value="toilets" />
             <optional>
-                <combo key="access" text="Access rights" values="yes,permissive,customers" />
+                <reference ref="POI_access" />
                 <checkgroup columns="3">
                     <check key="female" text="Female" text_context="restroom" />
@@ -4080,5 +4080,5 @@
             <space />
             <key key="amenity" value="shower" />
-            <combo key="access" text="Access rights" values="yes,permissive,customers" />
+            <reference ref="POI_access" />
             <optional>
                 <checkgroup columns="3">
@@ -4245,8 +4245,8 @@
             <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="POI_access" />
             <reference ref="fee" />
             <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Operation times" values="24/7" values_no_i18n="true" />
+            <combo key="opening_hours" text="Operation times" delimiter="|" values="24/7|Mo-Su 08:00-22:00" values_no_i18n="true" />
         </item> <!-- Sanitary Dump Station -->
         <separator/>
@@ -4279,5 +4279,5 @@
             <space />
             <key key="amenity" value="hunting_stand" />
-            <text key="height" text="Height (meters)" />
+            <text key="height" text="Height (meters)" length="7" />
             <check key="shelter" text="Shelter" />
             <check key="hide" text="Hide" text_context="hunting stand" />
@@ -4318,6 +4318,5 @@
             <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" />
@@ -4523,5 +4522,5 @@
             <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" />
@@ -4896,5 +4895,5 @@
                 <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)" />
+                <text key="height" text="Height (meters)" length="7" />
             </optional>
             <preset_link preset_name="Address" />
@@ -4907,5 +4906,5 @@
                 <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)" />
+                <text key="height" text="Height (meters)" length="7" />
             </optional>
             <preset_link preset_name="Address" />
@@ -4918,5 +4917,5 @@
             <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)" />
+            <text key="height" text="Height (meters)" length="7" />
             <text key="min_height" text="Skipped height (meters)" />
         </item> <!-- Building part -->
@@ -4933,5 +4932,5 @@
                 <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="General Access" values="yes,private,delivery,customers,permissive,no" />
             <reference ref="wheelchair" />
             <optional>
@@ -4957,5 +4956,5 @@
             <combo key="tower:type" text="Tower type" values="bell_tower,communication,cooling,defensive,observation,radar,watchtower" values_searchable="true" />
             <optional>
-                <text key="height" text="Height (meters)" />
+                <text key="height" text="Height (meters)" length="7" />
                 <text key="operator" text="Operator" />
             </optional>
@@ -4981,5 +4980,5 @@
             <key key="man_made" value="chimney" />
             <reference ref="name_operator" />
-            <text key="height" text="Height (meters)" />
+            <text key="height" text="Height (meters)" length="7" />
         </item> <!-- Chimney -->
         <item name="Kiln" icon="presets/misc/kiln.svg" type="node,closedway" preset_name_label="true">
@@ -5225,7 +5224,6 @@
             <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" />
+            <text key="ele" text="Elevation (meters)" lenght="10" />
             <combo key="material" text="Material" values="andesite,brass,bronze,concrete,granite,metal,steel,stone" />
         </item> <!-- Survey Point -->
@@ -5250,5 +5248,5 @@
                 <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)" />
+                <text key="height" text="Height (meters)" length="7" />
             </optional>
         </item> <!-- Surveillance Camera -->
@@ -5592,5 +5590,5 @@
             <space />
             <key key="building" value="transformer_tower" />
-            <text key="height" text="Height (meters)" />
+            <text key="height" text="Height (meters)" length="7" />
             <reference ref="ref_operator" />
             <preset_link preset_name="Power Substation" />
@@ -5610,5 +5608,5 @@
             <space />
             <key key="power" value="portal" />
-            <text key="height" text="Height (meters)" />
+            <text key="height" text="Height (meters)" length="7" />
             <combo key="structure" text="Type of construction" values="lattice,tubular,solid" />
             <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
@@ -5622,5 +5620,5 @@
             <space />
             <key key="power" value="tower" />
-            <text key="height" text="Height (meters)" />
+            <text key="height" text="Height (meters)" length="7" />
             <combo key="structure" text="Type of construction" values="lattice,tubular,solid" />
             <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
@@ -7154,5 +7152,5 @@
             <key key="natural" value="peak" />
             <reference ref="name_wikipedia" />
-            <text key="ele" text="Elevation" />
+            <text key="ele" text="Elevation (meters)" lenght="10" />
         </item> <!-- Peak -->
         <item name="Saddle" icon="presets/landmark/saddle.svg" type="node" preset_name_label="true">
@@ -7162,5 +7160,5 @@
             <key key="natural" value="saddle" />
             <reference ref="name_wikipedia" />
-            <text key="ele" text="Elevation" />
+            <text key="ele" text="Elevation (meters)" lenght="10" />
         </item> <!-- Saddle -->
         <item name="Glacier" icon="presets/landmark/glacier.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -7170,5 +7168,5 @@
             <key key="natural" value="glacier" />
             <reference ref="name_wikipedia" />
-            <text key="ele" text="Elevation" />
+            <text key="ele" text="Elevation (meters)" lenght="10" />
         </item> <!-- Glacier -->
         <item name="Volcano" icon="presets/landmark/volcano.svg" type="node" preset_name_label="true">
@@ -7178,5 +7176,5 @@
             <key key="natural" value="volcano" />
             <reference ref="name_wikipedia" />
-            <text key="ele" text="Elevation" />
+            <text key="ele" text="Elevation (meters)" lenght="10" />
             <optional>
                 <combo key="volcano:status" text="Current Status" values="active,dormant,extinct" />
@@ -7190,5 +7188,5 @@
             <key key="natural" value="ridge" />
             <reference ref="name_wikipedia" />
-            <text key="ele" text="Elevation" />
+            <text key="ele" text="Elevation (meters)" lenght="10" />
         </item> <!-- Ridge -->
         <item name="Valley" icon="presets/landmark/valley.svg" type="way" preset_name_label="true">
@@ -7205,5 +7203,5 @@
             <key key="natural" value="cliff" />
             <text key="name" text="Name" />
-            <text key="height" text="Height (meters)" />
+            <text key="height" text="Height (meters)" length="7" />
         </item> <!-- Cliff -->
         <item name="Cave Entrance" icon="presets/landmark/cave_entrance.svg" type="node,closedway" preset_name_label="true">
@@ -7214,5 +7212,5 @@
             <reference ref="name_wikipedia" />
             <reference ref="oh_wheelchair" />
-            <reference ref="general_access" />
+            <reference ref="POI_access" />
             <reference ref="fee" />
         </item> <!-- Cave Entrance -->
@@ -7255,5 +7253,5 @@
                 <reference ref="genus_species_taxon" />
                 <space />
-                <text key="height" text="Height (meters)" />
+                <text key="height" text="Height (meters)" length="7" />
                 <text key="diameter_crown" text="Diameter crown (meters)" />
                 <text key="circumference" text="Circumference (meters)" />
@@ -7271,5 +7269,5 @@
             <optional>
                 <reference ref="genus_species_taxon" />
-                <text key="height" text="Height (meters)" />
+                <text key="height" text="Height (meters)" length="7" />
             </optional>
         </item> <!-- Tree Row -->
@@ -7659,4 +7657,6 @@
             <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 schema:" 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">
@@ -7672,4 +7672,6 @@
             <text key="wikipedia" text="Wikipedia" />
             <text key="image" text="Image" />
+            <space />
+            <preset_link preset_name="Contact (Common Schema)" text="Similar tags but different tagging schema:" 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">
@@ -7988,5 +7990,5 @@
                 <text key="network" text="Network" />
                 <text key="operator" text="Operator" />
-                <text key="distance" text="Distance (km)"/>
+                <text key="distance" text="Distance (kilometers)"/>
                 <roles>
                     <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry"/>
@@ -8050,5 +8052,5 @@
             <key key="type" value="destination_sign" />
             <text key="destination" text="Destination written on sign (w/o distance)" />
-            <text key="distance" text="Distance (km)" />
+            <text key="distance" text="Distance (kilometers)" />
             <text key="time" text="Time (hh:mm, for trekking)" />
             <text key="colour:back" text="Colour of background" />
@@ -8092,5 +8094,5 @@
             <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)" />
+            <text key="height" text="Height (meters)" length="7" />
             <text key="length" text="Length (meters)" />
             <text key="operator" text="Operator" />