Index: data/defaultpresets.xml
===================================================================
--- data/defaultpresets.xml (revision 6208)
+++ data/defaultpresets.xml (working copy)
@@ -186,7 +186,6 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=motorway_link"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=motorway_link" />
             <label text="Edit Motorway Link" />
-            <space />
             <key key="highway" value="motorway_link" />
             <optional>
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
@@ -293,7 +292,6 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Link_(highway)"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)"/>
             <label text="Edit Primary Link" />
-            <space />
             <key key="highway" value="primary_link" />
             <optional>
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
@@ -347,7 +345,6 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Link_(highway)"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)"/>
             <label text="Edit Secondary Link" />
-            <space />
             <key key="highway" value="secondary_link" />
             <optional>
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
@@ -401,7 +398,6 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Link_(highway)"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)"/>
             <label text="Edit Tertiary Link" />
-            <space />
             <key key="highway" value="tertiary_link" />
             <optional>
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
@@ -427,10 +423,10 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=unclassified"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=unclassified" />
             <label text="Edit Unclassified Road" />
-            <space />
             <key key="highway" value="unclassified" />
             <optional>
                 <text key="name" text="Name" />
+                <text key="ref" text="Reference" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
                 <text key="maxspeed" text="Max. speed (km/h)" />
@@ -481,7 +477,7 @@
             <space />
             <key key="bicycle_road" value="yes" />
             <key key="bicycle" value="designated" />
-            <combo key="highway" text="Highway type" values_context="Highway" values="residential,service,unclassified,path,cycleway" default="residential" />
+            <combo key="highway" text="Highway type" values="residential,service,unclassified,path,cycleway" values_context="highway" default="residential" />
             <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"/>
@@ -562,11 +558,11 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=service"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=service"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=service" />
-            <label text="Edit Serviceway" />
+            <label text="Edit Service Way" />
             <space />
             <key key="highway" value="service" />
+            <combo key="service" text="Service way type" values="alley,driveway,parking_aisle" />
             <optional>
-                <combo key="service" text="Serviceway type" values="alley,driveway,parking_aisle" />
                 <text key="name" text="Name" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
@@ -592,7 +588,6 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:service=parking_aisle"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:service=parking_aisle" />
             <label text="Edit Parking Aisle" />
-            <space />
             <key key="highway" value="service" />
             <key key="service" value="parking_aisle" />
             <optional>
@@ -610,7 +605,6 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=road"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=road" />
             <label text="Edit Road of unknown type" />
-            <space />
             <key key="highway" value="road" />
             <optional>
                 <text key="name" text="Name" />
@@ -629,14 +623,13 @@
             </optional>
         </item>
         <item name="Construction" icon="presets/construction.png" type="way,closedway">
-            <label text="Edit Highway Under Construction" />
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:construction"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:construction"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:construction"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:construction"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:construction" />
-            <space />
+            <label text="Edit Highway Under Construction" />
             <key key="highway" value="construction" />
             <optional>
                 <text key="name" text="Name" />
@@ -669,14 +662,17 @@
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Key:access"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:access" />
             <label text="Edit Road Restrictions" />
+            <space />
             <check key="oneway" text="Oneway" default="off" />
             <check key="toll" text="Toll" default="off"  />
             <check key="noexit" text="No exit (cul-de-sac)" default="off"  />
             <label text="Transport mode restrictions" />
+            <space />
             <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" match="key" />
             <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" />
             <label text="Vehicles per type" />
+            <space />
             <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,no" match="key" />
             <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
@@ -685,6 +681,7 @@
             <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" />
             <label text="Vehicles per use" />
+            <space />
             <combo key="agricultural" text="Agricultural" values="yes,official,designated,destination,permissive,private,no" match="key" />
             <combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,permissive,private,no" match="keyvalue" />
             <combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,private,no" match="key" />
@@ -713,7 +710,7 @@
             <label text="Edit Junction" />
             <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" />
+            <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" />
             <optional>
                 <text key="name" text="Name" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
@@ -750,11 +747,10 @@
             </optional>
         </item>
         <item name="Ford" icon="presets/ford.png" type="node,way">
-            <label text="Edit Ford" />
             <link href="http://wiki.openstreetmap.org/wiki/Key:ford"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:ford"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:ford" />
-            <space />
+            <label text="Edit Ford" />
             <key key="ford" value="yes" />
             <optional>
                 <text key="name" text="Name" />
@@ -775,8 +771,8 @@
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:highway=track"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=track" />
             <label text="Edit Track" />
-            <combo key="tracktype" text="Tracktype" values="grade1,grade2,grade3,grade4,grade5" />
             <space />
+            <combo key="tracktype" text="Tracktype" values="grade1,grade2,grade3,grade4,grade5" />
             <key key="highway" value="track" />
             <optional>
                 <text key="name" text="Name" />
@@ -807,7 +803,6 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=path"
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:highway=path" />
             <label text="Edit Path" />
-            <space />
             <key key="highway" value="path" />
             <optional>
                 <text key="name" text="Name" />
@@ -849,7 +844,6 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=bridleway"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=bridleway" />
             <label text="Edit Bridleway" />
-            <space />
             <key key="highway" value="bridleway" />
             <optional>
                 <text key="name" text="Name" />
@@ -866,7 +860,7 @@
                 <text key="width" text="Width (meters)" />
             </optional>
         </item>
-        <item name="Cycle Lane" type="way">
+        <item name="Cycle Lane/Track" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Bicycle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Bicycle"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Bicycle"
@@ -875,15 +869,17 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Bicycle"
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Bicycle"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Bicycle" />
-            <label text="Edit Cycle Lane" />
-            <combo key="cycleway" text="Cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" />
-            <combo key="cycleway:left" text="Cycleway left" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" />
-            <combo key="cycleway:right" text="Cycleway right" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" />
+            <label text="Edit Cycle Lane or Track" />
+            <space />
+            <combo key="cycleway" text="Cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" values_context="cycleway" match="key" />
+            <combo key="cycleway:left" text="Cycleway left" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" values_context="cycleway" />
+            <combo key="cycleway:right" text="Cycleway right" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" values_context="cycleway" />
             <check key="oneway:bicycle" text="Oneway (bicycle)" default="off" />
             <space />
-            <label text="Edit 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" />
-            <check key="oneway" text="Oneway" default="off" />
+            <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" />
+                <check key="oneway" text="Oneway" default="off" />
+            </optional>
         </item>
         <item name="Dedicated Cycleway" icon="presets/cycleway.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
@@ -894,7 +890,6 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=cycleway"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=cycleway" />
             <label text="Edit Cycleway" />
-            <space />
             <key key="highway" value="cycleway" />
             <optional>
                 <text key="name" text="Name" />
@@ -916,7 +911,6 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
             <label text="Edit Cycleway" />
-            <space />
             <key key="highway" value="path" />
             <key key="bicycle" value="designated" />
             <key key="foot" value="designated" />
@@ -940,7 +934,6 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
             <label text="Edit Cycleway" />
-            <space />
             <key key="highway" value="path" />
             <key key="bicycle" value="designated" />
             <key key="foot" value="designated" />
@@ -969,7 +962,6 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=footway"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=footway" />
             <label text="Edit Footway" />
-            <space />
             <key key="highway" value="footway" />
             <optional>
                 <text key="name" text="Name" />
@@ -994,7 +986,6 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=steps"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=steps" />
             <label text="Edit Flight of Steps" />
-            <space />
             <key key="highway" value="steps" />
             <optional>
                 <text key="name" text="Name" />
@@ -1033,7 +1024,6 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=services"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=services" />
             <label text="Edit Service Station" />
-            <space />
             <key key="highway" value="services" />
             <optional>
                 <text key="name" text="Name" />
@@ -1051,7 +1041,6 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=rest_area"
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:highway=rest_area" />
             <label text="Edit Rest Area" />
-            <space />
             <key key="highway" value="rest_area" />
             <optional>
                 <text key="name" text="Name" />
@@ -1067,7 +1056,6 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=traffic_signals"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=traffic_signals" />
             <label text="Edit Traffic Signal" />
-            <space />
             <key key="highway" value="traffic_signals" />
             <optional text="Optional crossing attributes:">
                  <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
@@ -1129,7 +1117,6 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=passing_place"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=passing_place"/>
-            <label text="Edit Passing Place" />
             <key key="highway" value="passing_place" />
         </item>
         <item name="Turning Circle" icon="presets/turning_circle.png" type="node">
@@ -1147,7 +1134,6 @@
             <label text="Edit City Limit Sign" />
             <space />
             <key key="traffic_sign" value="city_limit" />
-            <space />
             <text key="name" text="Name" />
             <text key="alt_name" text="Second Name" />
         </item>
@@ -1176,7 +1162,6 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:mountain_pass"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:mountain_pass" />
             <label text="Edit Mountain Pass" />
-            <space />
             <key key="mountain_pass" value="yes" />
             <optional>
                 <text key="name" text="Name" />
@@ -1185,22 +1170,23 @@
             </optional>
         </item>
     </group> <!-- Waypoints -->
-    <group name="Barriers" icon="presets/barrier.png">
-
-        <!-- *** node barriers *** -->
+    <group name="Barriers" icon="presets/barrier.png"> <!-- *** node barriers *** -->
         <item name="Block" icon="presets/block.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=block"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=block"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=block" />
             <label text="Edit Block" />
-            <space />
             <key key="barrier" value="block" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" />
-            <check key="bicycle" text="Bicycle" default="on" />
-            <check key="horse" text="Horse" default="off" />
-            <check key="motorcycle" text="Motorcycle" default="off" />
+            <optional text="Allowed traffic:">
+                <check key="foot" text="Foot" default="on" />
+                <check key="bicycle" text="Bicycle" default="on" />
+                <check key="horse" text="Horse" default="off" />
+                <check key="motorcycle" text="Motorcycle" default="off" />
+            </optional>
+            <optional>
+                <text key="maxwidth" text="Max. width (meters)" length="7" />
+                <combo key="material" text="Material" values="concrete,stone" />
+            </optional>
         </item> <!-- block -->
         <item name="Bollard" icon="presets/bollard.png" type="node,way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard"
@@ -1212,15 +1198,16 @@
             <label text="Edit Bollard" />
             <space />
             <key key="barrier" value="bollard" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" />
-            <check key="bicycle" text="Bicycle" default="on" />
-            <check key="horse" text="Horse" default="off" />
-            <check key="motorcycle" text="Motorcycle" default="off" />
+            <combo key="bollard" text="Bollard type" values="rising,removable" />
+            <optional text="Allowed traffic:">
+                <check key="foot" text="Foot" default="on" />
+                <check key="bicycle" text="Bicycle" default="on" />
+                <check key="horse" text="Horse" default="off" />
+                <check key="motorcycle" text="Motorcycle" default="off" />
+            </optional>
             <optional>
                 <text key="maxwidth" text="Max. width (meters)" length="7" />
-                <combo key="bollard" text="Bollard type" values="rising,removable" />
+                <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
             </optional>
         </item> <!-- bollard -->
         <item name="Cycle Barrier" icon="styles/standard/vehicle/cycle_barrier.png" type="node">
@@ -1229,14 +1216,13 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:barrier=cycle_barrier"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=cycle_barrier" />
             <label text="Edit Cycle Barrier" />
-            <space />
             <key key="barrier" value="cycle_barrier" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" />
-            <check key="bicycle" text="Bicycle" default="on" />
-            <check key="horse" text="Horse" default="off" />
-            <check key="motorcycle" text="Motorcycle" default="off" />
+            <optional text="Allowed traffic:">
+                <check key="foot" text="Foot" default="on" />
+                <check key="bicycle" text="Bicycle" default="on" />
+                <check key="horse" text="Horse" default="off" />
+                <check key="motorcycle" text="Motorcycle" default="off" />
+            </optional>
             <optional>
                 <text key="maxwidth" text="Max. width (meters)" length="7" />
             </optional>
@@ -1244,20 +1230,18 @@
         <item name="Cattle Grid" icon="presets/cattle_grid.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
             <label text="Edit Cattle Grid" />
-            <space />
             <key key="barrier" value="cattle_grid" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" />
-            <check key="bicycle" text="Bicycle" default="on" />
-            <check key="motorcycle" text="Motorcycle" default="off" />
-            <check key="motorcar" text="Motorcar" default="off" />
+            <optional text="Allowed traffic:">
+                <check key="foot" text="Foot" default="on" />
+                <check key="bicycle" text="Bicycle" default="on" />
+                <check key="motorcycle" text="Motorcycle" default="off" />
+                <check key="motorcar" text="Motorcar" default="off" />
+            </optional>
         </item> <!-- cattle_grid -->
         <item name="Bus Trap" icon="presets/empty.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bus_trap"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=bus_trap" />
             <label text="Edit Bus Trap" />
-            <space />
             <key key="barrier" value="bus_trap" />
             <optional>
                 <text key="maxwidth" text="Max. width (meters)" length="7" />
@@ -1265,15 +1249,14 @@
         </item> <!-- bus_trap -->
         <item name="Spikes" icon="presets/empty.png" type="node">
             <label text="Edit Spikes" />
-            <space />
             <key key="barrier" value="spikes" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" />
-            <check key="bicycle" text="Bicycle" default="on" />
-            <check key="horse" text="Horse" default="off" />
-            <check key="motorcycle" text="Motorcycle" default="off" />
-            <check key="motorcar" text="Motorcar" default="off" />
+            <optional text="Allowed traffic:">
+                <check key="foot" text="Foot" default="on" />
+                <check key="bicycle" text="Bicycle" default="on" />
+                <check key="horse" text="Horse" default="off" />
+                <check key="motorcycle" text="Motorcycle" default="off" />
+                <check key="motorcar" text="Motorcar" default="off" />
+            </optional>
         </item> <!-- spikes -->
         <item name="Toll Booth" icon="presets/toll_station.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth"
@@ -1285,7 +1268,6 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=toll_booth"
                   zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Tag:barrier=toll_booth" />
             <label text="Edit Toll Booth" />
-            <space />
             <key key="barrier" value="toll_booth" />
             <optional>
                 <text key="name" text="Name" />
@@ -1294,19 +1276,16 @@
         </item> <!-- toll_booth -->
         <item name="Border Control" icon="presets/douane.png" type="node">
             <label text="Edit Border Control" />
-            <space />
             <key key="barrier" value="border_control" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" />
-            <check key="bicycle" text="Bicycle" default="on" />
-            <check key="horse" text="Horse" default="off" />
-            <check key="motorcycle" text="Motorcycle" default="off" />
-            <check key="motorcar" text="Motorcar" default="off" />
+            <optional text="Allowed traffic:">
+                <check key="foot" text="Foot" default="on" />
+                <check key="bicycle" text="Bicycle" default="on" />
+                <check key="horse" text="Horse" default="off" />
+                <check key="motorcycle" text="Motorcycle" default="off" />
+                <check key="motorcar" text="Motorcar" default="off" />
+            </optional>
         </item> <!-- border_control -->
-        <separator/>
-
-        <!-- *** linear barriers *** -->
+        <separator/> <!-- *** linear barriers *** -->
         <item name="Hedge" icon="presets/hedge.png" type="way,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=hedge"
@@ -1317,7 +1296,6 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:barrier=hedge"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=hedge" />
             <label text="Edit Hedge" />
-            <space />
             <key key="barrier" value="hedge" />
             <optional>
                 <text key="height" text="Height (meters)" length="7" />
@@ -1336,7 +1314,6 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:barrier=fence"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=fence" />
             <label text="Edit Fence" />
-            <space />
             <key key="barrier" value="fence" />
             <optional>
                 <combo key="fence_type" text="Type" values="barbed_wire,chain_link,electric,metal,pole,split_rail,wire,wood" />
@@ -1346,7 +1323,6 @@
         <item name="Guard Rail" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=guard_rail" />
             <label text="Edit Guard Rail" />
-            <space />
             <key key="barrier" value="guard_rail" />
             <optional>
                 <text key="height" text="Height (meters)" length="7" />
@@ -1362,7 +1338,6 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=wall"
                   zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Tag:barrier=wall" />
             <label text="Edit Wall" />
-            <space />
             <key key="barrier" value="wall" />
             <optional>
                 <text key="height" text="Height (meters)" length="7" />
@@ -1374,7 +1349,6 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:barrier=city_wall"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=city_wall" />
             <label text="Edit City Wall" />
-            <space />
             <key key="barrier" value="city_wall" />
             <optional>
                 <text key="height" text="Height (meters)" length="7" />
@@ -1388,20 +1362,18 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:barrier=retaining_wall"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=retaining_wall" />
             <label text="Edit Retaining Wall" />
-            <space />
             <key key="barrier" value="retaining_wall" />
             <optional>
                 <text key="height" text="Height (meters)" length="7" />
             </optional>
         </item> <!-- retaining_wall -->
-        <item name="Ditch" name_context="Barrier" type="way">
+        <item name="Ditch" name_context="barrier" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=ditch"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:barrier=ditch"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=ditch"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:barrier=ditch"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=ditch" />
-            <label text="Edit Ditch" />
-            <space />
+            <label text="Edit Ditch" text_context="barrier" />
             <key key="barrier" value="ditch" />
             <optional>
                 <text key="width" text="Width (meters)" length="7" />
@@ -1409,29 +1381,25 @@
         </item> <!-- ditch -->
         <item name="Kerb" type="way,closedway">
             <label text="Edit Kerb" />
-            <space />
             <key key="barrier" value="kerb" />
             <optional>
                 <text key="height" text="Height (meters)" length="7" />
             </optional>
         </item> <!-- kerb -->
-        <separator/>
-
-        <!-- *** access *** -->
+        <separator/> <!-- *** access *** -->
         <item name="Entrance (barrier opening)" icon="styles/standard/vehicle/entrance.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=entrance"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=entrance"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=entrance" />
             <label text="Edit Entrance (barrier opening)" />
-            <space />
             <key key="barrier" value="entrance" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" />
-            <check key="bicycle" text="Bicycle" default="on" />
-            <check key="horse" text="Horse" default="off" />
-            <check key="motorcycle" text="Motorcycle" default="off" />
-            <check key="motorcar" text="Motorcar" default="off" />
+            <optional text="Allowed traffic:">
+                <check key="foot" text="Foot" default="on" />
+                <check key="bicycle" text="Bicycle" default="on" />
+                <check key="horse" text="Horse" default="off" />
+                <check key="motorcycle" text="Motorcycle" default="off" />
+                <check key="motorcar" text="Motorcar" default="off" />
+            </optional>
             <optional>
                 <text key="maxwidth" text="Max. width (meters)" length="7" />
             </optional>
@@ -1444,15 +1412,14 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:barrier=gate"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=gate" />
             <label text="Edit Gate" />
-            <space />
             <key key="barrier" value="gate" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" />
-            <check key="bicycle" text="Bicycle" default="on" />
-            <check key="horse" text="Horse" default="off" />
-            <check key="motorcycle" text="Motorcycle" default="off" />
-            <check key="motorcar" text="Motorcar" default="off" />
+            <optional text="Allowed traffic:">
+                <check key="foot" text="Foot" default="on" />
+                <check key="bicycle" text="Bicycle" default="on" />
+                <check key="horse" text="Horse" default="off" />
+                <check key="motorcycle" text="Motorcycle" default="off" />
+                <check key="motorcar" text="Motorcar" default="off" />
+            </optional>
             <optional>
                 <text key="maxwidth" text="Max. width (meters)" length="7" />
             </optional>
@@ -1465,45 +1432,42 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:barrier=lift_gate"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=lift_gate" />
             <label text="Edit Lift Gate" />
-            <space />
             <key key="barrier" value="lift_gate" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" />
-            <check key="bicycle" text="Bicycle" default="on" />
-            <check key="horse" text="Horse" default="off" />
-            <check key="motorcycle" text="Motorcycle" default="off" />
-            <check key="motorcar" text="Motorcar" default="off" />
+            <optional text="Allowed traffic:">
+                <check key="foot" text="Foot" default="on" />
+                <check key="bicycle" text="Bicycle" default="on" />
+                <check key="horse" text="Horse" default="off" />
+                <check key="motorcycle" text="Motorcycle" default="off" />
+                <check key="motorcar" text="Motorcar" default="off" />
+            </optional>
             <optional>
                 <text key="maxwidth" text="Max. width (meters)" length="7" />
             </optional>
         </item> <!-- lift_gate -->
         <item name="Hampshire Gate" icon="presets/empty.png" type="node">
             <label text="Edit Hampshire Gate" />
-            <space />
             <key key="barrier" value="hampshire_gate" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" />
-            <check key="bicycle" text="Bicycle" default="on" />
-            <check key="horse" text="Horse" default="off" />
-            <check key="motorcycle" text="Motorcycle" default="off" />
-            <check key="motorcar" text="Motorcar" default="off" />
+            <optional text="Allowed traffic:">
+                <check key="foot" text="Foot" default="on" />
+                <check key="bicycle" text="Bicycle" default="on" />
+                <check key="horse" text="Horse" default="off" />
+                <check key="motorcycle" text="Motorcycle" default="off" />
+                <check key="motorcar" text="Motorcar" default="off" />
+            </optional>
             <optional>
                 <text key="maxwidth" text="Max. width (meters)" length="7" />
             </optional>
         </item> <!-- hampshire_gate -->
         <item name="Bump Gate" icon="presets/empty.png" type="node">
             <label text="Edit Bump Gate" />
-            <space />
             <key key="barrier" value="bump_gate" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" />
-            <check key="bicycle" text="Bicycle" default="on" />
-            <check key="horse" text="Horse" default="off" />
-            <check key="motorcycle" text="Motorcycle" default="off" />
-            <check key="motorcar" text="Motorcar" default="off" />
+            <optional text="Allowed traffic:">
+                <check key="foot" text="Foot" default="on" />
+                <check key="bicycle" text="Bicycle" default="on" />
+                <check key="horse" text="Horse" default="off" />
+                <check key="motorcycle" text="Motorcycle" default="off" />
+                <check key="motorcar" text="Motorcar" default="off" />
+            </optional>
             <optional>
                 <text key="maxwidth" text="Max. width (meters)" length="7" />
             </optional>
@@ -1511,12 +1475,11 @@
         <item name="Kissing Gate" icon="presets/empty.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=kissing_gate" />
             <label text="Edit Kissing Gate" />
-            <space />
             <key key="barrier" value="kissing_gate" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" />
-            <check key="bicycle" text="Bicycle" default="off" />
+            <optional text="Allowed traffic:">
+                <check key="foot" text="Foot" default="on" />
+                <check key="bicycle" text="Bicycle" default="off" />
+            </optional>
             <optional>
                 <text key="maxwidth" text="Max. width (meters)" length="7" />
             </optional>
@@ -1525,15 +1488,14 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=chain"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=chain" />
             <label text="Edit Chain" />
-            <space />
             <key key="barrier" value="chain" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" />
-            <check key="bicycle" text="Bicycle" default="on" />
-            <check key="horse" text="Horse" default="off" />
-            <check key="motorcycle" text="Motorcycle" default="off" />
-            <check key="motorcar" text="Motorcar" default="off" />
+            <optional text="Allowed traffic:">
+                <check key="foot" text="Foot" default="on" />
+                <check key="bicycle" text="Bicycle" default="on" />
+                <check key="horse" text="Horse" default="off" />
+                <check key="motorcycle" text="Motorcycle" default="off" />
+                <check key="motorcar" text="Motorcar" default="off" />
+            </optional>
             <optional>
                 <text key="maxwidth" text="Max. width (meters)" length="7" />
             </optional>
@@ -1543,51 +1505,47 @@
             <label text="Edit Stile" />
             <space />
             <key key="barrier" value="stile" />
+            <combo key="stile" text="Type" values="ladder,squeezer,stepover" />
             <optional>
-                <combo key="stile" text="Type" values="ladder,squeezer,stepover" />
                 <combo key="material" text="Material" values="metal,stone,wood" />
             </optional>
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" />
-            <check key="bicycle" text="Bicycle" default="off" />
+            <optional text="Allowed traffic:">
+                <check key="foot" text="Foot" default="on" />
+                <check key="bicycle" text="Bicycle" default="off" />
+            </optional>
         </item> <!-- stile -->
         <item name="Turnstile" icon="styles/standard/vehicle/turnstile.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=stile"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=stile" />
             <label text="Edit Turnstile" />
-            <space />
             <key key="barrier" value="turnstile" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" />
-            <check key="bicycle" text="Bicycle" default="off" />
+            <optional text="Allowed traffic:">
+                <check key="foot" text="Foot" default="on" />
+                <check key="bicycle" text="Bicycle" default="off" />
+            </optional>
         </item> <!-- turnstile -->
         <item name="Sally Port" icon="styles/standard/vehicle/sally_port.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=sally_port"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=sally_port"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=sally_port" />
             <label text="Edit Sally Port" />
-            <space />
             <key key="barrier" value="sally_port" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" />
-            <check key="bicycle" text="Bicycle" default="on" />
-            <check key="horse" text="Horse" default="off" />
-            <check key="motorcycle" text="Motorcycle" default="off" />
-            <check key="motorcar" text="Motorcar" default="off" />
+            <optional text="Allowed traffic:">
+                <check key="foot" text="Foot" default="on" />
+                <check key="bicycle" text="Bicycle" default="on" />
+                <check key="horse" text="Horse" default="off" />
+                <check key="motorcycle" text="Motorcycle" default="off" />
+                <check key="motorcar" text="Motorcar" default="off" />
+            </optional>
             <optional>
                 <text key="maxheight" text="Max. height (meters)" length="7" />
                 <text key="maxwidth" text="Max. width (meters)" length="7" />
             </optional>
         </item> <!-- sally_port -->
-
     </group> <!-- Barriers -->
     <group name="Passageways" icon="presets/tunnel.png">
         <item name="Tunnel" icon="presets/tunnel.png" type="way">
-            <label text="Edit Tunnel"/>
             <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:tunnel"
@@ -1597,7 +1555,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:tunnel"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:tunnel"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:tunnel" />
-            <space />
+            <label text="Edit Tunnel"/>
             <key key="tunnel" value="yes" />
             <optional>
                 <text key="name" text="Name" />
@@ -1608,7 +1566,6 @@
             </optional>
         </item>
         <item name="Building Passage" icon="presets/tunnel.png" type="way">
-            <label text="Edit Building Passage"/>
             <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:tunnel"
@@ -1618,7 +1575,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:tunnel"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:tunnel"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:tunnel" />
-            <space />
+            <label text="Edit Building Passage"/>
             <key key="tunnel" value="building_passage" />
             <optional>
                 <text key="name" text="Name" />
@@ -1629,12 +1586,12 @@
             </optional>
         </item>
         <item name="Arcade" type="way">
-            <label text="Edit Arcade"/>
             <link href="http://wiki.openstreetmap.org/wiki/Key:covered"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:covered"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:covered"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:covered"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:covered" />
+            <label text="Edit Arcade"/>
             <space />
             <key key="covered" value="arcade" />
             <check key="arcade:left" value_on="open" text="Open on left side" />
@@ -1646,12 +1603,12 @@
             </optional>
         </item>
         <item name="Colonnade" type="way">
-            <label text="Edit Colonnade"/>
             <link href="http://wiki.openstreetmap.org/wiki/Key:covered"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:covered"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:covered"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:covered"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:covered" />
+            <label text="Edit Colonnade"/>
             <space />
             <key key="covered" value="colonnade" />
             <check key="colonnade:left" value_on="open" text="Open on left side" />
@@ -1663,7 +1620,6 @@
             </optional>
         </item>
         <item name="Avalanche Protector" type="way">
-            <label text="Edit Avalanche Protector"/>
             <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:tunnel"
@@ -1673,6 +1629,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:tunnel"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:tunnel"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:tunnel" />
+            <label text="Edit Avalanche Protector"/>
             <space />
             <key key="tunnel" value="avalanche_protector" />
             <check key="avalanche_protector:left" value_on="open" text="Open on left side" />
@@ -1686,9 +1643,9 @@
         </item>
     </group>
   </group> <!-- Passageways -->
+  <separator/>
   <group name="Water" icon="presets/waterway.png">
     <group name="Water" icon="presets/waterway.png">
-        <separator/>
         <item name="Drain" icon="presets/waterway.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=drain"
@@ -1700,12 +1657,12 @@
             <text key="name" text="Name" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
         </item>
-        <item name="Ditch" icon="presets/waterway.png" type="way">
+        <item name="Ditch" name_context="waterway" icon="presets/waterway.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=ditch"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=ditch"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=ditch" />
-            <label text="Edit Ditch" />
+            <label text="Edit Ditch" text_context="waterway" />
             <space />
             <key key="waterway" value="ditch" />
             <text key="name" text="Name" />
@@ -1768,6 +1725,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=spring"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=spring" />
             <label text="Edit Spring" />
+            <space />
             <key key="natural" value="spring" />
             <text key="name" text="Name" />
         </item>
@@ -1807,8 +1765,6 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=groyne"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=groyne"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=groyne" />
-            <label text="Edit Groyne" />
-            <space />
             <key key="man_made" value="groyne" />                               
         </item>
         <item name="Breakwater" icon="presets/groyne.png" type="way,closedway">
@@ -1823,13 +1779,12 @@
         </item>
         <separator/>
         <item name="Culvert" icon="presets/tunnel.png" type="way">
-            <label text="Edit Culvert"/>
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tunnel=culvert"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:tunnel=culvert"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:tunnel=culvert"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:tunnel=culvert"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:tunnel=culvert" />
-            <space />
+            <label text="Edit Culvert"/>
             <key key="tunnel" value="culvert" />
             <optional>
                 <text key="name" text="Name" />
@@ -1858,6 +1813,7 @@
         </item>
         <item name="Covered Reservoir" icon="presets/reservoir_covered.png" type="node,closedway,relation">
             <label text="Edit Covered Reservoir" />
+            <space />
             <key key="man_made" value="reservoir_covered" />
             <text key="name" text="Name" />
         </item>
@@ -1870,11 +1826,13 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=water"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=water" />
             <label text="Edit Water" />
+            <space />
             <key key="natural" value="water" />
             <text key="name" text="Name" />
         </item>
         <item name="Land" icon="presets/landuse.png" type="node,closedway,relation">
             <label text="Edit Land" />
+            <space />
             <key key="natural" value="land" />
             <text key="name" text="Name" />
         </item>
@@ -1884,6 +1842,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=coastline"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=coastline" />
             <label text="Edit Coastline" />
+            <space />
             <key key="natural" value="coastline" />
             <text key="name" text="Name" />
         </item>
@@ -1895,6 +1854,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=riverbank"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=riverbank" />
             <label text="Edit Riverbank" />
+            <space />
             <key key="waterway" value="riverbank" />
             <text key="name" text="Name" />
         </item>
@@ -1910,6 +1870,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=wetland"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=wetland" />
             <label text="Edit Wetland" />
+            <space />
             <key key="natural" value="wetland" />
             <text key="name" text="Name" />
             <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove" />
@@ -1917,6 +1878,7 @@
         <item name="Mud" icon="presets/mud.png" type="node,closedway,relation">
             <label text="Edit Mud" />
             <key key="natural" value="mud" />
+            <space />
             <text key="name" text="Name" />
         </item>
         <item name="Beach" icon="presets/beach.png" type="node,closedway,relation">
@@ -1926,11 +1888,13 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=beach"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=beach" />
             <label text="Edit Beach" />
+            <space />
             <key key="natural" value="beach" />
             <text key="name" text="Name" />
         </item>
         <item name="Bay" icon="presets/bay.png" type="node,closedway,relation">
             <label text="Edit Bay" />
+            <space />
             <key key="natural" value="bay" />
             <text key="name" text="Name" />
         </item>
@@ -1941,6 +1905,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=cliff"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=cliff" />
             <label text="Edit Cliff" />
+            <space />
             <key key="natural" value="cliff" />
             <text key="name" text="Name" />
         </item>
@@ -1954,6 +1919,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=ferry_terminal"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=ferry_terminal" />
             <label text="Edit Ferry Terminal" />
+            <space />
             <key key="amenity" value="ferry_terminal" />
             <text key="name" text="Name" />
             <combo key="cargo" text="Cargo" values="passengers,vehicle,bicycle,hgv,passengers;vehicle" />
@@ -1965,7 +1931,6 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:route=ferry"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:route=ferry" />
             <label text="Edit Ferry" />
-            <space />
             <key key="route" value="ferry" />
             <optional>
               <text key="name" text="Name" />
@@ -1974,6 +1939,7 @@
         <separator/>
         <item name="Marina" icon="presets/marina.png" type="node,closedway">
             <label text="Edit Marina" />
+            <space />
             <key key="leisure" value="marina" />
             <text key="name" text="Name" />
         </item>
@@ -1984,6 +1950,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=pier"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=pier" />
             <label text="Edit Pier" />
+            <space />
             <key key="man_made" value="pier" />
             <text key="name" text="Name" />
         </item>
@@ -2009,7 +1976,9 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=slipway" />
             <label text="Edit Slipway" />
             <key key="leisure" value="slipway" />
-            <text key="name" text="Name" />
+            <optional>
+                <text key="name" text="Name" />
+            </optional>
         </item>
         <item name="Boatyard" icon="presets/boatyard.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard"
@@ -2041,11 +2010,10 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=rail"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:railway=rail" />
             <label text="Edit Rail" />
-            <space />
             <key key="railway" value="rail" />
             <optional>
                 <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
-                <combo key="service" text="Service/Type" values="yard,siding,spur" />
+                <combo key="service" text="Service type" values="yard,siding,spur" />
                 <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
                 <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
                 <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" lenght="5" />
@@ -2056,11 +2024,10 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=light_rail" />
             <label text="Edit Narrow Gauge Rail" />
-            <space />
             <key key="railway" value="narrow_gauge" />
             <optional>
                 <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
-                <combo key="service" text="Types" values="yard,siding,spur" />
+                <combo key="service" text="Service type" values="yard,siding,spur" />
                 <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
                 <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
                 <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
@@ -2073,10 +2040,9 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=monorail"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=monorail" />
             <label text="Edit Monorail" />
-            <space />
             <key key="railway" value="monorail" />
             <optional>
-                <combo key="service" text="Types" values="yard,siding,spur" />
+                <combo key="service" text="Service type" values="yard,siding,spur" />
                 <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
                 <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" />
@@ -2085,10 +2051,9 @@
         <item name="Preserved" icon="presets/rail_preserved.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=preserved" />
             <label text="Edit Preserved Railway" />
-            <space />
             <key key="railway" value="preserved" />
             <optional>
-                <combo key="service" text="Types" values="yard,siding,spur" />
+                <combo key="service" text="Service type" values="yard,siding,spur" />
                 <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
                 <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
                 <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
@@ -2098,10 +2063,9 @@
         <item name="Light Rail" icon="presets/rail_light.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail" />
             <label text="Edit Light Rail" />
-            <space />
             <key key="railway" value="light_rail" />
             <optional>
-                <combo key="service" text="Types" values="yard,siding,spur" />
+                <combo key="service" text="Service type" values="yard,siding,spur" />
                 <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
                 <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
                 <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
@@ -2113,12 +2077,10 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=subway"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=subway"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=subway" />
-            <label text="Edit Tram" />
             <label text="Edit Subway" />
-            <space />
             <key key="railway" value="subway" />
             <optional>
-                <combo key="service" text="Types" values="yard,siding,spur" />
+                <combo key="service" text="Service type" values="yard,siding,spur" />
                 <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
                 <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
                 <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
@@ -2133,10 +2095,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=tram"
                   uk.href="http://wiki.openstreetmap.org/wiki/UK:Tag:railway=tram" />
             <label text="Edit Tram" />
-            <space />
             <key key="railway" value="tram" />
             <optional>
-                <combo key="service" text="Types" values="yard,siding,spur" />
+                <combo key="service" text="Service type" values="yard,siding,spur" />
                 <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
                 <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
                 <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
@@ -2148,7 +2109,6 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_guideway"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=bus_guideway" />
             <label text="Edit Bus Guideway" />
-            <space />
             <key key="highway" value="bus_guideway" />
             <optional>
                 <text key="name" text="Name" />
@@ -2168,20 +2128,18 @@
         <item name="Disused Rail" icon="presets/railway.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=disused" />
             <label text="Edit Disused Railway" />
-            <space />
             <key key="railway" value="disused" />
             <optional>
-                <combo key="service" text="Types" values="yard,siding,spur" />
+                <combo key="service" text="Service type" values="yard,siding,spur" />
             </optional>
         </item>
         <item name="Abandoned Rail" icon="presets/railway.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=abandoned"
                   de.href="http://wiki.openstreetmap.org/wiki/Tag:railway=abandoned" />
             <label text="Edit Abandoned Railway" />
-            <space />
             <key key="railway" value="abandoned" />
             <optional>
-                <combo key="service" text="Types" values="yard,siding,spur" />
+                <combo key="service" text="Service type" values="yard,siding,spur" />
             </optional>
         </item>
         <separator/>
@@ -2196,6 +2154,7 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=level_crossing"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=level_crossing"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=level_crossing" />
+            <label text="Edit Level Crossing" />
             <key key="railway" value="level_crossing" />
             <optional>
                 <check key="supervised" text="Supervised" default="off" />
@@ -2212,6 +2171,7 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:crossing"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:crossing"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:crossing" />
+            <label text="Edit Crossing" />
             <key key="railway" value="crossing" />
             <optional>
                 <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
@@ -2239,6 +2199,7 @@
         <item name="Chair Lift" icon="presets/chair_lift.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
             <label text="Edit Chair Lift" />
+            <space />
             <key key="aerialway" value="chair_lift" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2253,6 +2214,7 @@
         <item name="Drag Lift" icon="presets/drag_lift.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
             <label text="Edit Drag Lift" />
+            <space />
             <key key="aerialway" value="drag_lift" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2267,6 +2229,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aerialway=cable_car"
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:aerialway=cable_car" />
             <label text="Edit Cable Car" />
+            <space />
             <key key="aerialway" value="cable_car" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2283,6 +2246,7 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Proposed_features/Piste_Maps"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Proposed_features/Piste_Maps" />
             <label text="Edit Gondola" />
+            <space />
             <key key="aerialway" value="gondola" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2296,6 +2260,7 @@
         <item name="Mixed Lift" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=mixed_lift" />
             <label text="Edit Mixed Lift (containing both gondolas and chairs)" />
+            <space />
             <key key="aerialway" value="mixed_lift" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2310,6 +2275,7 @@
         <item name="T-bar Lift" icon="presets/drag_lift.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
             <label text="Edit T-bar Lift" />
+            <space />
             <key key="aerialway" value="t-bar" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2321,6 +2287,7 @@
         <item name="J-bar Lift" icon="presets/drag_lift.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
             <label text="Edit J-bar Lift" />
+            <space />
             <key key="aerialway" value="j-bar" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2332,6 +2299,7 @@
         <item name="Platter Lift" icon="presets/drag_lift.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
             <label text="Edit Platter Lift" />
+            <space />
             <key key="aerialway" value="platter" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2343,6 +2311,7 @@
         <item name="Rope Tow" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
             <label text="Edit Rope Tow" />
+            <space />
             <key key="aerialway" value="rope_tow" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2354,6 +2323,7 @@
         <item name="Magic Carpet" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
             <label text="Edit Magic Carpet" />
+            <space />
             <key key="aerialway" value="magic_carpet" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2362,8 +2332,9 @@
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
             </optional>
         </item>
-        <item name="Goods" name_context="aerialway" icon="presets/goods.png" type="way">
-            <label text="Edit Goods" text_context="aerialway" />
+        <item name="Goods" icon="presets/goods.png" type="way">
+            <label text="Edit Goods" />
+            <space />
             <key key="aerialway" value="goods" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2375,12 +2346,14 @@
         <item name="Station" name_context="aerialway" icon="presets/aerialway_station.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
             <label text="Edit Station" text_context="aerialway" />
+            <space />
             <key key="aerialway" value="station" />
             <text key="name" text="Name" />
         </item>
-        <item name="Pylon" name_context="aerialway" icon="presets/power_tower.png" type="node">
+        <item name="Pylon" icon="presets/power_tower.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-            <label text="Edit Pylon" text_context="aerialway" />
+            <label text="Edit Pylon" />
+            <space />
             <key key="aerialway" value="pylon" />
             <text key="name" text="Name" />
         </item>
@@ -2397,10 +2370,11 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=parking"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=parking" />
             <label text="Edit Parking" />
+            <space />
             <key key="amenity" value="parking" />
             <text key="name" text="Name" />
+            <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" values_context="parking" />
             <text key="ref" text="Reference number" />
-            <combo key="parking" text="Type" values="multi-storey,surface,underground" default="surface" />
             <text key="maxheight" text="Max. height (meters)" />
             <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
             <combo key="park_ride" text="Park and Ride" values="yes,no" />
@@ -2418,10 +2392,11 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking_space"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=parking_space" />
             <label text="Edit Parking space" />
+            <space />
             <key key="amenity" value="parking_space" />
             <text key="name" text="Name" />
+            <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" values_context="parking" />
             <text key="ref" text="Reference number" />
-            <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
             <text key="capacity" text="Capacity" />
             <space />
             <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
@@ -2438,11 +2413,12 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking_entrance"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=parking_entrance" />
             <label text="Edit Parking entrance" />
+            <space />
             <key key="amenity" value="parking_entrance" />
             <text key="name" text="Name" />
+            <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" values_context="parking" />
             <text key="ref" text="Reference number" />
             <space />
-            <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
             <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
             <combo key="fee" text="Fee" values="yes,no,interval" />
             <text key="operator" text="Operator" />
@@ -2454,7 +2430,7 @@
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <separator/>
-        <item name="Fuel" icon="presets/fuel.png" type="node,closedway">
+        <item name="Fuel" name_context="amenity" icon="presets/fuel.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=fuel"
@@ -2466,6 +2442,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=fuel"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fuel" />
             <label text="Edit Fuel" />
+            <space />
             <key key="amenity" value="fuel" />
             <combo key="brand" text="Brand" values="Agip,Aral,Avia,BP,Chevron,Citgo,Esso,Exxon,Gulf,Mobil,OMV,Petro-Canada,Pioneer,Q8,Repsol,Shell,Sunoco,Statoil,Tamoil,Texaco,Total,Independent" />
             <optional>
@@ -2497,6 +2474,7 @@
         <item name="Charging Station" icon="styles/standard/accommodation/camping/hookup.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"/>
             <label text="Edit Charging Station (for electric cars)" />
+            <space />
             <key key="amenity" value="charging_station" />
             <text key="operator" text="Operator" />
             <text key="voltage" text="Voltage" />
@@ -2504,6 +2482,7 @@
         </item>            
         <item name="Wash" icon="presets/car_wash.png" type="node,closedway">
             <label text="Edit Car Wash" />
+            <space />
             <key key="amenity" value="car_wash" />
             <text key="name" text="Name" />
             <text key="brand" text="Brand" />
@@ -2520,12 +2499,14 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=car"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=car" />
             <label text="Edit Car Shop" />
+            <space />
             <key key="shop" value="car" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
         </item>
         <item name="Repair" icon="presets/car_repair.png" type="node,closedway">
             <label text="Edit Car Repair" />
+            <space />
             <key key="shop" value="car_repair" />
             <text key="name" text="Name" />
             <text key="brand" text="Brand" />
@@ -2534,6 +2515,7 @@
         </item>
         <item name="Tyres" icon="presets/tyres.png" type="node,closedway">
             <label text="Edit Tyres" />
+            <space />
             <key key="shop" value="tyres" />
             <text key="name" text="Name" />
             <text key="brand" text="Brand" />
@@ -2553,6 +2535,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=car_rental"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=car_rental" />
             <label text="Edit Car Rental" />
+            <space />
             <key key="amenity" value="car_rental" />
             <text key="name" text="Name" />
             <text key="brand" text="Brand" />
@@ -2568,6 +2551,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=car_sharing"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=car_sharing" />
             <label text="Edit Car Sharing" />
+            <space />
             <key key="amenity" value="car_sharing" />
             <text key="operator" text="Operator" />
             <text key="capacity" text="Capacity" />
@@ -2579,10 +2563,11 @@
     <group name="Motorcycle" icon="presets/motorbike.png">
         <item name="Parking" icon="styles/standard/vehicle/parking/motorbike.png" type="node,closedway">
             <label text="Edit Motorcycle Parking" />
+            <space />
             <key key="amenity" value="motorcycle_parking" />
             <text key="name" text="Name" />
             <text key="capacity" text="Capacity" />
-            <combo key="parking" text="Type" values="multi-storey,surface,underground" default="surface" />
+            <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" values_context="parking" />
             <combo key="fee" text="Fee" values="yes,no" />
         </item>
         <item name="Motorcycle Dealer" icon="presets/motorbike.png" type="node,closedway">
@@ -2591,24 +2576,27 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=motorcycle"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=motorcycle"/>
             <label text="Edit Shop Motorcycle" />
+            <space />
             <key key="shop" value="motorcycle" />
             <text key="name" text="Name" />
             <combo key="brand" text="Brand" values="independent" />
             <text key="operator" text="Operator" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
-            <label text="Services:" />
-                <combo key="sale" text="Sale" values="yes,brand,used,no" values_context="motorcycle" />
+            <optional text="Services:">
+                <combo key="sale" text="Sale" values="yes,brand,used,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" />
                 <text key="services" text="Other" />
-            <label text="Contact:" />
+            </optional>
+            <optional text="Contact:">
                 <text key="phone" text="Phone Number" />
                 <text key="fax" text="Fax Number" />
                 <text key="website" text="Website" />
                 <text key="email" text="Email Address" />
+            </optional>
         </item>
     </group> <!-- Motorcycle -->
     <group name="Bicycle" icon="presets/bike.png">
@@ -2622,6 +2610,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bicycle_parking"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=bicycle_parking" />
             <label text="Edit Bicycle Parking" />
+            <space />
             <key key="amenity" value="bicycle_parking" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -2639,15 +2628,16 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=bicycle"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:shop=bicycle" />
             <label text="Edit Bicycle Shop" />
+            <space />
             <key key="shop" value="bicycle" />
             <text key="name" text="Name" />
-			<check key="service:bicycle:retail" text="Bicycles are sold" />
-			<check key="service:bicycle:second_hand" text="Second-hand bicycles are sold" />
-			<check key="service:bicycle:repair" text="Bicycles are repaired" />
-			<check key="service:bicycle:rental" text="Bicycles are rented" />
-			<check key="service:bicycle:pump" text="Free bicycle pump" />
-			<check key="service:bicycle:diy" text="Tools for do-it-yourself repair (may be a bike co-operative)" />
-			<check key="service:bicycle:cleaning" text="Bicycles are washed (for a fee)" />
+            <check key="service:bicycle:retail" text="Bicycles are sold" />
+            <check key="service:bicycle:second_hand" text="Second-hand bicycles are sold" />
+            <check key="service:bicycle:repair" text="Bicycles are repaired" />
+            <check key="service:bicycle:rental" text="Bicycles are rented" />
+            <check key="service:bicycle:pump" text="Free bicycle pump" />
+            <check key="service:bicycle:diy" text="Tools for do-it-yourself repair (may be a bike co-operative)" />
+            <check key="service:bicycle:cleaning" text="Bicycles are washed (for a fee)" />
         </item>
         <item name="Rental" icon="presets/bicycle_rental.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
@@ -2661,6 +2651,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bicycle_rental"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=bicycle_rental" />
             <label text="Edit Bicycle Rental" />
+            <space />
             <key key="amenity" value="bicycle_rental" />
             <text key="name" text="Name" />
         </item>
@@ -2669,6 +2660,7 @@
         <item name="Public transport route" icon="presets/path.png" type="relation">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route"/>
             <label text="Edit Route"/>
+            <space />
             <key key="type" value="route"/>
             <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry"/>
             <text key="name" text="Name"/>
@@ -2695,6 +2687,7 @@
         <item name="Route master" icon="presets/path.png" type="relation">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route_master"/>
             <label text="Edit Route master"/>
+            <space />
             <key key="type" value="route_master"/>
             <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry"/>
             <text key="name" text="Name"/>
@@ -2711,6 +2704,7 @@
         <item name="Stop Area" type="relation" icon="presets/interpolation.png">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_area"/>
             <label text="Edit Stop Area"/>
+            <space />
             <key key="type" value="public_transport"/>
             <key key="public_transport" value="stop_area"/>
             <text key="name" text="Name"/>
@@ -2730,6 +2724,8 @@
         <separator/>
         <item name="Stop Position" type="node" icon="presets/barrier.png">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_area"/>
+            <label text="Edit Stop Position"/>
+            <space />
             <key key="public_transport" value="stop_position"/>
             <text key="name" text="Name"/>
             <optional>
@@ -2739,7 +2735,6 @@
                 <text key="operator" text="Operator"/>
                 <text key="network" text="Network"/>
             </optional>
-            <space/>
             <check key="bus" text="Bus"/>
             <check key="highway" value_on="bus_stop" value_off="" text="Bus stop (legacy)"/>
             <check key="tram" text="Tram"/>
@@ -2757,6 +2752,8 @@
         </item>
         <item name="Platform" type="node,way,closedway" icon="presets/platform_bus.png">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Platform"/>
+            <label text="Edit Platform"/>
+            <space />
             <key key="public_transport" value="platform"/>
             <text key="name" text="Name"/>
             <check key="bench" text="Bench"/>
@@ -2784,8 +2781,10 @@
                 <check key="ferry" text="ferry"/>
             </optional>
         </item>
-        <item name="Station" type="node,closedway" icon="styles/standard/transport/railway_station.png">
+        <item name="Station" name_context="railway" type="node,closedway" icon="styles/standard/transport/railway_station.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:public_transport=station"/>
+            <label text="Edit Station" text_context="railway" />
+            <space />
             <key key="public_transport" value="station"/>
             <text key="name" text="Name"/>
             <check key="area" text="Area"/>
@@ -2800,7 +2799,6 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=subway_entrance"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=subway_entrance" />
             <label text="Edit Subway Entrance" />
-            <space />
             <key key="railway" value="subway_entrance" />
             <optional>
                 <text key="name" text="Name" />
@@ -2814,6 +2812,8 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=vending_machine"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=vending_machine"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=vending_machine"/>
+            <label text="Edit Ticket Machine" text_context="railway" />
+            <space />
             <key key="amenity" value="vending_machine"/>
             <key key="vending" value="public_transport_tickets"/>
             <text key="name" text="Name"/>
@@ -2836,7 +2836,6 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=station"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:railway=station" />
             <label text="Edit Station" text_context="railway" />
-            <space />
             <key key="railway" value="station" />
             <optional>
                 <text key="name" text="Name" />
@@ -2849,7 +2848,6 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=halt"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:railway=halt" />
             <label text="Edit Halt" />
-            <space />
             <key key="railway" value="halt" />
             <optional>
                 <text key="name" text="Name" />
@@ -2860,7 +2858,6 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=tram_stop" />
             <label text="Edit Tram Stop" />
-            <space />
             <key key="railway" value="tram_stop" />
             <optional>
                 <text key="name" text="Name" />
@@ -2871,8 +2868,8 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=platform" />
             <label text="Edit Railway Platform" />
-            <key key="railway" value="platform" />
             <space />
+            <key key="railway" value="platform" />
             <text key="ref" text="Reference (track number)" />
             <text key="width" text="Width (meters)" />
             <check key="area" text="Area" default="off" />
@@ -2898,20 +2895,18 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=bus_stop"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=bus_stop" />
             <label text="Edit Bus Stop" />
-            <space />
             <key key="highway" value="bus_stop" />
             <optional>
                 <text key="name" text="Name" />
                 <combo key="shelter" text="Shelter" values="yes,no" />
                 <combo key="bench" text="Bench" values="yes,no" />
                 <combo key="tactile_paving" text="Tactile Paving" values="yes,no" />
-
             </optional>
         </item>
         <item name="Bus Platform" icon="presets/platform_bus.png" type="node,way,closedway">
             <label text="Edit Bus Platform" />
-            <key key="highway" value="platform" />
             <space />
+            <key key="highway" value="platform" />
             <text key="ref" text="Reference (track number)" />
             <text key="width" text="Width (meters)" />
             <check key="area" text="Area" default="off" />
@@ -2922,7 +2917,8 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=taxi"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=taxi"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=taxi" />
-        <label text="Edit Taxi station" />
+        <label text="Edit Taxi Station" />
+        <space />
         <key key="amenity" value="taxi" />
         <text key="name" text="Name" />
     </item>
@@ -2933,6 +2929,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=aerodrome"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=aerodrome" />
             <label text="Edit Airport Ground" />
+            <space />
             <key key="aeroway" value="aerodrome" />
             <text key="name" text="Name" />
             <optional>
@@ -2981,25 +2978,21 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aeroway=apron"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=apron"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=apron" />
-            <label text="Apron" />
             <key key="aeroway" value="apron" />
         </item>
         <item name="Hangar" icon="presets/hangar.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-            <label text="Hangar" />
             <key key="building" value="hangar" />
         </item>
         <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=beacon"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=beacon" />
-            <label text="Beacon" />
             <key key="man_made" value="beacon" />
         </item>
         <item name="Windsock" icon="styles/standard/transport/airport/windsock.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=windsock" />
-            <label text="Windsock" />
             <key key="aeroway" value="windsock" />
         </item>
         <separator/>
@@ -3009,6 +3002,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=terminal"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=terminal" />
             <label text="Edit Terminal" />
+            <space />
             <key key="aeroway" value="terminal" />
             <text key="name" text="Name" />
         </item>
@@ -3017,6 +3011,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=gate"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=gate" />
             <label text="Edit Terminal Gate" />
+            <space />
             <key key="aeroway" value="gate" />
             <text key="ref" text="Reference" />
         </item>
@@ -3032,6 +3027,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=hotel"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=hotel" />
             <label text="Edit Hotel" />
+            <space />
             <key key="tourism" value="hotel" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3052,6 +3048,7 @@
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=motel"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=motel" />
             <label text="Edit Motel" />
+            <space />
             <key key="tourism" value="motel" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3072,6 +3069,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=guest_house"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=guest_house" />
             <label text="Edit Guest House" />
+            <space />
             <key key="tourism" value="guest_house" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3093,6 +3091,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=chalet"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=chalet" />
             <label text="Edit Chalet" />
+            <space />
             <key key="tourism" value="chalet" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3115,6 +3114,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=hostel"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=hostel" />
             <label text="Edit Hostel" />
+            <space />
             <key key="tourism" value="hostel" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3137,6 +3137,7 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=alpine_hut"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=alpine_hut" />
             <label text="Edit Alpine Hut" />
+            <space />
             <key key="tourism" value="alpine_hut" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3158,6 +3159,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=caravan_site"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=caravan_site" />
             <label text="Edit Caravan Site" />
+            <space />
             <key key="tourism" value="caravan_site" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3187,6 +3189,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=camp_site"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=camp_site" />
             <label text="Edit Camping Site" />
+            <space />
             <key key="tourism" value="camp_site" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3213,6 +3216,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=restaurant"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=restaurant" />
             <label text="Edit Restaurant" />
+            <space />
             <key key="amenity" value="restaurant" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3238,6 +3242,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=fast_food"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fast_food" />
             <label text="Edit Fast Food Restaurant" />
+            <space />
             <key key="amenity" value="fast_food" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3260,6 +3265,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=food_court"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=food_court" />
             <label text="Edit Food Court" />
+            <space />
             <key key="amenity" value="food_court" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3284,6 +3290,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=cafe"
                   zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Tag:amenity=cafe" />
             <label text="Edit Cafe" />
+            <space />
             <key key="amenity" value="cafe" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3307,6 +3314,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=pub"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=pub" />
             <label text="Edit Pub" />
+            <space />
             <key key="amenity" value="pub" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3330,6 +3338,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=biergarten"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=biergarten" />
             <label text="Edit Biergarten" />
+            <space />
             <key key="amenity" value="biergarten" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3356,6 +3365,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bar"
                   zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Tag:amenity=bar" />
             <label text="Edit Bar" />
+            <space />
             <key key="amenity" value="bar" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3380,6 +3390,7 @@
                   ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:amenity=nightclub"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=nightclub" />
             <label text="Edit Nightclub" />
+            <space />
             <key key="amenity" value="nightclub" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3419,6 +3430,7 @@
     <group name="Tourism" icon="presets/sightseeing.png">
         <item name="Attraction" icon="presets/sightseeing.png" type="node,closedway">
             <label text="Edit Attraction" />
+            <space />
             <key key="tourism" value="attraction" />
             <text key="name" text="Name" />
             <text key="opening_hours" text="Opening Hours" />
@@ -3430,6 +3442,7 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=viewpoint"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=viewpoint" />
             <label text="Edit Viewpoint" />
+            <space />
             <key key="tourism" value="viewpoint" />
             <text key="name" text="Name" />
 <!--<check key="man_made" value="tower" text="Look-Out Tower" default="off" />-->
@@ -3441,6 +3454,8 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:information"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:information"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:information" />
+            <label text="Edit Information Office" />
+            <space />
             <key key="tourism" value="information" />
             <key key="information" value="office" />
             <text key="name" text="Name" />
@@ -3448,25 +3463,30 @@
         </item>
         <item name="Map" icon="presets/map.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
+            <label text="Edit Information Map" />
+            <space />
             <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" />
             <combo key="map_size" text="Shown Area" values="site,city,region" />
             <text key="description" text="Closer Description" />
-            <space />
-            <label text="Routes shown for:" />
-            <check key="hiking" text="Hiking" default="off" />
-            <check key="bicycle" text="Cycling" default="off" />
-            <check key="mtb" text="Mountainbiking" default="off" />
-            <check key="ski" text="Skiing" default="off" />
-            <check key="horse" text="Riding" default="off" />
-            <label text="... other transportation modes possible" />
+            <optional text="Routes shown for:">
+                <check key="hiking" text="Hiking" default="off" />
+                <check key="bicycle" text="Cycling" default="off" />
+                <check key="mtb" text="Mountainbiking" default="off" />
+                <check key="ski" text="Skiing" default="off" />
+                <check key="horse" text="Riding" default="off" />
+                <space />
+                <label text="... other transportation modes possible" />
+            </optional>
         </item>
         <item name="Information Board" icon="presets/board.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:information=board"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Proposed_features/information"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Proposed_features/information" />
+            <label text="Edit Information Board" />
+            <space />
             <key key="tourism" value="information" />
             <key key="information" value="board" />
             <text key="name" text="Name" />
@@ -3477,21 +3497,26 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:information=guidepost"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:information=guidepost"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:information=guidepost" />
+            <label text="Edit Guidepost" />
+            <space />
             <key key="tourism" value="information" />
             <key key="information" value="guidepost" />
             <text key="name" text="Name" />
             <text key="ele" text="Elevation" />
-            <space />
-            <label text="Routes shown for:" />
-            <check key="hiking" text="Hiking" default="off" />
-            <check key="bicycle" text="Cycling" default="off" />
-            <check key="mtb" text="Mountainbiking" default="off" />
-            <check key="ski" text="Skiing" default="off" />
-            <check key="horse" text="Riding" default="off" />
-            <label text="... other transportation modes possible" />
+            <optional text="Routes shown for:">
+                <check key="hiking" text="Hiking" default="off" />
+                <check key="bicycle" text="Cycling" default="off" />
+                <check key="mtb" text="Mountainbiking" default="off" />
+                <check key="ski" text="Skiing" default="off" />
+                <check key="horse" text="Riding" default="off" />
+                <space />
+                <label text="... other transportation modes possible" />
+            </optional>
         </item>
         <item name="Information Terminal" icon="presets/information.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
+            <label text="Edit Information Terminal" />
+            <space />
             <key key="tourism" value="information" />
             <key key="information" value="terminal" />
             <text key="name" text="Name" />
@@ -3502,6 +3527,8 @@
         </item>
         <item name="Audioguide" icon="presets/information.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
+            <label text="Edit Audioguide" />
+            <space />
             <key key="tourism" value="information" />
             <key key="information" value="audioguide" />
             <text key="name" text="Name" />
@@ -3513,12 +3540,14 @@
             <label text="Audioguide via mobile phone?" />
             <text key="phone" text="Phone number" />
         </item>
-        <item name="Other Information Points" icon="presets/information.png" type="node,closedway">
+        <item name="Other Information Point" icon="presets/information.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=information"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=information"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=information"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=information"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=information" />
+            <label text="Edit Information Point" />
+            <space />
             <key key="tourism" value="information" />
             <text key="name" text="Name" />
             <text key="description" text="Closer Description" />
@@ -3533,6 +3562,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=cinema"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=cinema" />
             <label text="Edit Cinema" />
+            <space />
             <key key="amenity" value="cinema" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />            
@@ -3543,6 +3573,7 @@
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zoo"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=zoo" />
             <label text="Edit Zoo" />
+            <space />
             <key key="tourism" value="zoo" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -3563,6 +3594,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=dog_park"
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:leisure=dog_park" />
             <label text="Edit Dog Park" />
+            <space />
             <key key="leisure" value="dog_park" />
             <text key="name" text="Name" />
             <check key="area" text="Area" default="off" />
@@ -3575,6 +3607,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=theme_park"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=theme_park"  />	
             <label text="Edit Theme Park" />
+            <space />
             <key key="tourism" value="theme_park" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />            
@@ -3594,6 +3627,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisurem=water_park"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:leisure=water_park"  />	
             <label text="Edit Water Park" />
+            <space />
             <key key="leisure" value="water_park" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />            
@@ -3610,6 +3644,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=sauna"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=sauna" />
             <label text="Edit Sauna" />
+            <space />
             <key key="leisure" value="sauna" />
             <text key="name" text="Name" />            
             <text key="operator" text="Operator" />            
@@ -3624,6 +3659,7 @@
         <item name="Horse riding" icon="presets/equestrian.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=horse_riding" />
             <label text="Edit Horse riding" />
+            <space />
             <key key="leisure" value="horse_riding" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3642,6 +3678,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=brothel"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=brothel" />
             <label text="Edit Brothel" />
+            <space />
             <key key="amenity" value="brothel" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3667,11 +3704,13 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=playground"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:leisure=playground" />
             <label text="Edit Playground" />
+            <space />
             <key key="leisure" value="playground" />
             <text key="name" text="Name" />
         </item>
         <item name="Picnic Site" icon="presets/picnic.png" type="node,closedway">
             <label text="Edit Picnic Site" />
+            <space />
             <key key="tourism" value="picnic_site" />
             <text key="name" text="Name" />
             <check key="fireplace" text="Fireplace" default="off" />
@@ -3695,6 +3734,7 @@
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=fishing"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=fishing" />
             <label text="Edit Fishing" />
+            <space />
             <key key="leisure" value="fishing" />
             <text key="name" text="Name" />
         </item>
@@ -3710,6 +3750,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=museum"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=museum" />
             <label text="Edit Museum" />
+            <space />
             <key key="tourism" value="museum" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3723,6 +3764,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=theatre"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=theatre" />
             <label text="Edit Theatre" />
+            <space />
             <key key="amenity" value="theatre" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3736,6 +3778,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=library"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=library" />
             <label text="Edit Library" />
+            <space />
             <key key="amenity" value="library" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3748,6 +3791,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=arts_centre"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=arts_centre" />
             <label text="Edit Arts Centre" />
+            <space />
             <key key="amenity" value="arts_centre" />
             <text key="name" text="Name" />
         </item>
@@ -3759,6 +3803,7 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:tourism=artwork"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=artwork" />
             <label text="Edit Artwork" />
+            <space />
             <key key="tourism" value="artwork" />
             <text key="name" text="Name" />
         </item>
@@ -3777,6 +3822,7 @@
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
                   zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
             <label text="Edit Place of Worship" />
+            <space />
             <key key="amenity" value="place_of_worship" />
             <text key="name" text="Name" />
             <combo key="building" text="Building type" values="cathedral,chapel,church,mosque,synagogue,temple" match="keyvalue" />
@@ -3806,6 +3852,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=public_building"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=public_building" />
             <label text="Edit Public Building" />
+            <space />
             <key key="amenity" value="public_building" />
             <text key="name" text="Name" />
         </item>
@@ -3817,6 +3864,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=townhall"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=townhall" />
             <label text="Edit Town hall" />
+            <space />
             <key key="amenity" value="townhall" />
             <text key="name" text="Name" />
         </item>
@@ -3841,6 +3889,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=embassy"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=embassy" />
             <label text="Edit Embassy" />
+            <space />
             <key key="amenity" value="embassy" />
             <text key="name" text="Name" />
         </item>
@@ -3851,6 +3900,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=courthouse"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=courthouse" />
             <label text="Edit Courthouse" />
+            <space />
             <key key="amenity" value="courthouse" />
             <text key="name" text="Name" />
         </item>
@@ -3861,6 +3911,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=prison"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=prison" />
             <label text="Edit Prison" />
+            <space />
             <key key="amenity" value="prison" />
             <text key="name" text="Name" />
         </item>
@@ -3874,6 +3925,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=police"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=police" />
             <label text="Edit Police" />
+            <space />
             <key key="amenity" value="police" />
             <text key="name" text="Name" />
         </item>
@@ -3886,6 +3938,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=fire_station"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fire_station" />
             <label text="Edit Fire Station" />
+            <space />
             <key key="amenity" value="fire_station" />
             <text key="name" text="Name" />
         </item>
@@ -3898,14 +3951,16 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=post_office"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=post_office" />
             <label text="Edit Post Office" />
+            <space />
             <key key="amenity" value="post_office" />
             <text key="name" text="Name" />
-        <text key="operator" text="Operator" />
+            <text key="operator" text="Operator" />
         </item>
     </group> <!-- Public Buildings -->
     <group name="Education" icon="presets/school.png">
         <item name="Kindergarten" icon="presets/kindergarten.png" type="node,closedway,relation">
             <label text="Edit Kindergarten" />
+            <space />
             <key key="amenity" value="kindergarten" />
             <text key="name" text="Name" />
         </item>
@@ -3921,6 +3976,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=school"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=school" />
             <label text="Edit School" />
+            <space />
             <key key="amenity" value="school" />
             <text key="name" text="Name" />
         </item>
@@ -3934,6 +3990,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=university"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=university" />
             <label text="Edit University" />
+            <space />
             <key key="amenity" value="university" />
             <text key="name" text="Name" />
         </item>
@@ -3944,6 +4001,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=college"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=college" />
             <label text="Edit College" />
+            <space />
             <key key="amenity" value="college" />
             <text key="name" text="Name" />
         </item>
@@ -3967,13 +4025,16 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=hospital"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=hospital" />
             <label text="Edit Hospital" />
+            <space />
             <key key="amenity" value="hospital" />
             <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
         </item>
         <item name="Clinic" icon="styles/standard/health/hospital.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clinic"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=clinic" />
             <label text="Edit Clinic" />
+            <space />
             <key key="amenity" value="clinic" />
             <text key="name" text="Name" />
         </item>
@@ -3982,18 +4043,21 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=doctors"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=doctors" />
             <label text="Edit Doctors" />
+            <space />
             <key key="amenity" value="doctors" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway">
             <label text="Edit Dentist" />
+            <space />
             <key key="amenity" value="dentist" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Nursing Home" type="node,closedway">
             <label text="Edit Nursing Home" />
+            <space />
             <key key="amenity" value="nursing_home" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -4005,6 +4069,7 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:social_facility"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:social_facility" />
             <label text="Edit Retirement Home" />
+            <space />
             <key key="amenity" value="social_facility" />
             <key key="social_facility" value="group_home" />
             <key key="social_facility:for" value="senior" />
@@ -4022,9 +4087,10 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=pharmacy"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=pharmacy" />
             <label text="Edit Pharmacy" />
+            <space />
             <key key="amenity" value="pharmacy" />
-            <combo key="dispensing" text="Dispensing" values="yes,no" default="no" />
             <text key="name" text="Name" />
+            <combo key="dispensing" text="Dispensing" values="yes,no" default="no" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway">
@@ -4050,6 +4116,7 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=baby_hatch"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=baby_hatch" />
             <label text="Edit Baby Hatch" />
+            <space />
             <key key="amenity" value="baby_hatch" />
             <text key="operator" text="Operator" />
             <text key="opening_hours" text="Opening Hours" />
@@ -4079,6 +4146,7 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=veterinary"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=veterinary" />
             <label text="Edit Veterinary" />
+            <space />
             <key key="amenity" value="veterinary" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -4092,15 +4160,17 @@
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:amenity=toilets"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=toilets"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=toilets" />
+            <label text="Edit Toilets" />
+            <space />
             <key key="amenity" value="toilets" />
-            <combo key="access"           values="public,permissive,customers" text="Access rights" />
-            <combo key="drinking_water"   values="yes,no,seasonal" text="Drinking Water" />
-            <combo key="toilets:disposal" values="flush,pitlatrine,chemical,bucket" text="Type" />
+            <combo key="access" text="Access rights" values="public,permissive,customers" />
+            <combo key="drinking_water" text="Drinking Water" values="yes,no,seasonal" />
+            <combo key="toilets:disposal" text="Type" values="flush,pitlatrine,chemical,bucket" />
             <optional>
                 <text key="description" text="Description" />
                 <combo key="fee" text="Fee" values="yes,no" />
                 <text key="operator" text="Operator" />
-                <combo key="toilets:position" values="seated,seated;urinal,squat"  text="Position" />
+                <combo key="toilets:position" text="Position" values="seated,seated;urinal,squat,urinal" />
                 <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" />
             </optional>
         </item>
@@ -4110,6 +4180,8 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=post_box"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=post_box"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=post_box" />
+            <label text="Edit Postbox" />
+            <space />
             <key key="amenity" value="post_box" />
             <text key="operator" text="Operator" />
         </item>
@@ -4122,6 +4194,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=telephone"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=telephone" />
             <label text="Edit Telephone" />
+            <space />
             <key key="amenity" value="telephone" />
             <text key="operator" text="Operator" />
             <check key="payment:coins" text="Coins" default="off" />
@@ -4139,11 +4212,12 @@
             <key key="emergency" value="phone" />
         </item>
         <item name="Automated Defibrillator" icon="presets/aed.svg" type="node">
-            <link    href="http://wiki.openstreetmap.org/wiki/Tag:emergency=aed" 
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=aed" 
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=aed"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=aed" />
             <label text="Edit Automated External Defibrillator" />
-            <key   key="emergency" value="aed" />
+            <space />
+            <key key="emergency" value="aed" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,limited" />
             <text  key="operator" text="Operator" /> 
             <check key="indoor" text="Located inside a building?" default="off" />
@@ -4163,7 +4237,7 @@
             <label text="Edit Clock" />
             <key key="amenity" value="clock" />
             <optional>
-                <combo key="display" text="Display" values="analog,digital,sundial,unorthodox" values_context="display" />
+                <combo key="display" text="Display" values="analog,digital,sundial,unorthodox" />
                 <combo key="support" text="Support" values="pole,wall_mounted,billboard,ground" />
                 <combo key="visibility" text="Visibility/readability" values="house,street,area" display_values="house (up to 5m),street (up to 20m),area (more than 20m)" />
                 <check key="date" text="Shows current date" default="off" />
@@ -4181,7 +4255,8 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=recycling"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=recycling"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=recycling" />
-            <label text="Edit Recycling station" />
+            <label text="Edit Recycling Station" />
+            <space />
             <key key="amenity" value="recycling" />
             <check key="recycling:batteries" text="Batteries" default="off" />
             <check key="recycling:cans" text="Cans" default="off" />
@@ -4199,7 +4274,6 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=waste_basket"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=waste_basket"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=waste_basket" />
-            <label text="Edit Waste Basket" />
             <key key="amenity" value="waste_basket" />
         </item>
         <item name="Waste Disposal" icon="styles/standard/service/recycling/waste_disposal.png" type="node">
@@ -4208,7 +4282,6 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=waste_disposal"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=waste_disposal"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=waste_disposal" />
-            <label text="Edit Waste Disposal" />
             <key key="amenity" value="waste_disposal" />
         </item>
         <separator/>
@@ -4219,6 +4292,8 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=bench"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bench"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bench" />
+            <label text="Edit Bench" />
+            <space />
             <key key="amenity" value="bench" />
             <combo key="backrest" text="Backrest" values="yes,no" />
             <combo key="material" text="Material" values="stone,metal,wood,plastic" />
@@ -4227,6 +4302,7 @@
         </item>
         <item name="Shelter" icon="presets/shelter.png" type="node,closedway">
             <label text="Edit Shelter" />
+            <space />
             <key key="amenity" value="shelter" />
             <text key="name" text="Name" />
             <check key="fireplace" text="Fireplace" default="off" />
@@ -4234,6 +4310,7 @@
         </item>
         <item name="Hunting Stand" icon="presets/hunting_stand.png" type="node">
             <label text="Edit Hunting Stand" />
+            <space />
             <key key="amenity" value="hunting_stand" />
             <combo key="height" text="Height" values="low,half,full,5,10,15,20" values_context="height" />
             <combo key="shelter" text="Shelter" values="yes,no,unknown" />
@@ -4248,6 +4325,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=drinking_water"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=drinking_water" />
             <label text="Edit Source of Potable Water" />
+            <space />
             <key key="amenity" value="drinking_water" />
             <check key="indoor" text="Indoor" default="off" />
             <optional>
@@ -4264,6 +4342,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:emergency=fire_hydrant"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:emergency=fire_hydrant" />
             <label text="Edit Fire Hydrant" />
+            <space />
             <key key="emergency" value="fire_hydrant" />
             <combo key="fire_hydrant:type" text="Type" values="underground,pillar,wall,pond" values_context="pipeline" default="pillar" />
             <combo key="fire_hydrant:diameter" text="Diameter (in mm)" values="50,80,100,150,200,250,300,400" />
@@ -4272,7 +4351,7 @@
             <text key="ref" text="Reference" />
             <text key="operator" text="Operator" />
             <space />
-            <combo key="fire_hydrant:position" text="Position" values_context="hydrant position" values="lane,parking_lot,sidewalk,green" />
+            <combo key="fire_hydrant:position" text="Position" values="lane,parking_lot,sidewalk,green" values_context="hydrant position" />
             <combo key="fire_hydrant:pressure" text="Pressure (in bar)" values="5,6,8,suction" />
             <text key="fire_hydrant:count" text="Count" values="" />
         </item>
@@ -4282,48 +4361,50 @@
     <group name="Sport Facilities" icon="presets/stadium.png">
         <item name="Stadium" icon="presets/stadium.png" type="node,closedway">
             <label text="Edit Stadium" />
+            <space />
             <key key="leisure" value="stadium" />
             <text key="name" text="Name" />
-            <space />
-            <label text="select sport:" />
-            <space />
-            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
+            <optional text="Select sport:">
+                <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
+            </optional>
         </item>
         <item name="Sports Centre" icon="presets/sports_centre.png" type="node,closedway">
             <label text="Edit Sports Centre" />
+            <space />
             <key key="leisure" value="sports_centre" />
             <text key="name" text="Name" />
-            <space />
-            <label text="select sport:" />
-            <space />
-            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
+            <optional text="Select sport:">
+                <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
+            </optional>
         </item>
         <item name="Pitch" icon="presets/pitch.png" type="node,closedway">
             <label text="Edit Pitch" />
+            <space />
             <key key="leisure" value="pitch" />
             <text key="name" text="Name" />
-            <space />
-            <label text="select sport:" />
-            <space />
-            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,table_tennis,tennis" values_context="sport" />
+            <optional text="Select sport:">
+                <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
+            </optional>
         </item>
         <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway,relation">
             <label text="Edit Racetrack" />
+            <space />
             <key key="leisure" value="track" />
             <text key="name" text="Name" />
-            <space />
-            <label text="select sport:" />
-            <space />
-            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,table_tennis,tennis" values_context="sport" />
+            <optional text="Select sport:">
+                <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
+            </optional>
         </item>
         <item name="Golf Course" icon="presets/golf.png" type="node,closedway">
             <label text="Edit Golf Course" />
+            <space />
             <key key="leisure" value="golf_course" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Miniature Golf" icon="presets/golf.png" type="node,closedway">
             <label text="Edit Miniature Golf" />
+            <space />
             <key key="leisure" value="miniature_golf" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -4333,117 +4414,133 @@
         <item name="Multi" icon="styles/standard/sport/multi.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=multi" />
             <label text="Edit Multi" />
+            <space />
             <key key="sport" value="multi" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" />
         </item>
         <item name="9pin" icon="styles/standard/sport/10pin.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=9pin"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=9pin" />
             <label text="Edit 9pin" />
+            <space />
             <key key="sport" value="9pin" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item>
         <item name="10pin" icon="styles/standard/sport/10pin.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=10pin" />
             <label text="Edit 10pin" />
+            <space />
             <key key="sport" value="10pin" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item>
         <item name="Archery" icon="styles/standard/sport/archery.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=archery" />
             <label text="Edit Archery" />
+            <space />
             <key key="sport" value="archery" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item>
         <item name="Athletics" icon="presets/athletics.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sports=athletics" />
             <label text="Edit Athletics" />
+            <space />
             <key key="sport" value="athletics" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="track" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" default="track" />
         </item>
         <item name="Climbing" icon="styles/standard/sport/climbing.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=climbing"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=climbing" />
             <label text="Edit Climbing" />
+            <space />
             <key key="sport" value="climbing" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="sports_centre" />
+            <combo key="leisure" text="Type" values="sports_centre" />
         </item>
         <item name="Canoeing" icon="presets/canoe.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canoe" />
             <label text="Edit Canoeing" />
+            <space />
             <key key="sport" value="canoe" />
             <text key="name" text="Name" />
         </item>
         <item name="Cycling" icon="presets/cycling.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cycling" />
             <label text="Edit Cycling" />
+            <space />
             <key key="sport" value="cycling" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
         </item>
         <item name="Dog Racing" icon="styles/standard/leisure/dog.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=dog_racing" />
             <label text="Edit Dog Racing" />
+            <space />
             <key key="sport" value="dog_racing" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
         </item>
         <item name="Equestrian" icon="presets/equestrian.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=equestrian" />
             <label text="Edit Equestrian" />
+            <space />
             <key key="sport" value="equestrian" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" values_context="riding" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="riding" />
             <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
         </item>
         <item name="Horse Racing" icon="presets/equestrian.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=horse_racing" />
             <label text="Edit Horse Racing" />
+            <space />
             <key key="sport" value="horse_racing" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" values_context="riding" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="riding" />
             <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
         </item>
         <item name="Gymnastics" icon="presets/gymnastics.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gymnastics" />
             <label text="Edit Gymnastics" />
+            <space />
             <key key="sport" value="gymnastics" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item>
         <item name="Skating" icon="presets/skating.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skating"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=skating" />
-            <label text="Edit Skating" text_context="sport" />
+            <label text="Edit Skating" />
+            <space />
             <key key="sport" value="skating" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="ice_rink,pitch,sports_centre,stadium" default="ice_rink" />
+            <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" default="ice_rink" />
         </item>
         <item name="Skateboard" icon="styles/standard/sport/skateboard.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skateboard"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=skateboard" />
             <label text="Edit Skateboard" />
+            <space />
             <key key="sport" value="skateboard" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="pitch" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" default="pitch" values_context="racing" />
         </item>
         <item name="Swimming" icon="presets/swimming.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=swimming"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=swimming" />
             <label text="Edit Swimming" />
+            <space />
             <key key="sport" value="swimming" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="sports_centre,stadium,swimming_pool,water_park" default="swimming_pool" />
+            <combo key="leisure" text="Type" values="sports_centre,stadium,swimming_pool,water_park" default="swimming_pool" />
         </item>
         <item name="Skiing" icon="presets/skiing_downhill.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
             <label text="Edit Skiing" />
+            <space />
             <key key="sport" value="skiing" />
             <text key="name" text="Name" />
             <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,snow_park" />
@@ -4457,9 +4554,10 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=shooting"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=shooting" />
             <label text="Edit Shooting" />
+            <space />
             <key key="sport" value="shooting" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item>
     </group> <!-- Sport -->
     <group name="Sport (Ball)" icon="presets/soccer.png">
@@ -4468,73 +4566,82 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:sport=soccer"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=soccer"/>
             <label text="Edit Soccer" />
+            <space />
             <key key="sport" value="soccer" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Australian Football" icon="presets/soccer.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=australian_football"/>
             <label text="Edit Australian Football" />
+            <space />
             <key key="sport" value="australian_football" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="American Football" icon="presets/football.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=american_football"/>
             <label text="Edit American Football" />
+            <space />
             <key key="sport" value="american_football" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Canadian Football" icon="presets/football.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canadian_football"/>
             <label text="Edit Canadian Football" />
+            <space />
             <key key="sport" value="canadian_football" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Gaelic Games" icon="presets/soccer.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_games"/>
             <label text="Edit Gaelic Games" />
+            <space />
             <key key="sport" value="gaelic_games" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
             <optional>
-                <check key="gaelic_games:hurling" text="Hurling" text_context="gaelic game" default="off" />
-                <check key="gaelic_games:football" text="Football" text_context="gaelic game"  default="off" />
-                <check key="gaelic_games:camogie" text="Camogie" text_context="gaelic game"  default="off" />
-                <check key="gaelic_games:rounders" text="Rounders" text_context="gaelic game"  default="off" />
+                <check key="gaelic_games:hurling" text="Hurling" />
+                <check key="gaelic_games:football" text="Football" />
+                <check key="gaelic_games:camogie" text="Camogie" />
+                <check key="gaelic_games:rounders" text="Rounders" />
             </optional>
         </item>
         <item name="Rugby League" icon="presets/football.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_league"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_league"/>
             <label text="Edit Rugby League" />
+            <space />
             <key key="sport" value="rugby_league" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Rugby Union" icon="presets/football.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_union"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_union"/>
             <label text="Edit Rugby Union" />
+            <space />
             <key key="sport" value="rugby_union" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Baseball" icon="presets/baseball.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=baseball"/>
             <label text="Edit Baseball" />
+            <space />
             <key key="sport" value="baseball" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Basketball" icon="presets/basketball.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=basketball"/>
             <label text="Edit Basketball" />
+            <space />
             <key key="sport" value="basketball" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Volleyball" icon="styles/standard/sport/volleyball.png" type="node,closedway">         	
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=volleyball" />
@@ -4559,120 +4666,137 @@
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:sport=golf"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:sport=golf"/>
             <label text="Edit Golf" />
+            <space />
             <key key="sport" value="golf" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="golf_course,pitch,sports_centre,stadium" default="golf_course" />
+            <combo key="leisure" text="Type" values="golf_course,pitch,sports_centre,stadium" default="golf_course" />
         </item>
         <item name="Boule" icon="presets/boule.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=boules"/>
             <label text="Edit Boule" />
+            <space />
             <key key="sport" value="boules" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Bowls" icon="presets/boule.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=bowls"/>
             <label text="Edit Bowls" />
+            <space />
             <key key="sport" value="bowls" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Cricket" icon="presets/cricket.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket"/>
             <label text="Edit Cricket" />
+            <space />
             <key key="sport" value="cricket" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Cricket Nets" icon="presets/cricket.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket_nets"/>
             <label text="Edit Cricket Nets" />
+            <space />
             <key key="sport" value="cricket_nets" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item>
         <item name="Croquet" icon="styles/standard/sport/croquet.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=croquet"/>
             <label text="Edit Croquet" />
+            <space />
             <key key="sport" value="croquet" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Hockey" icon="presets/Hockey.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=hockey"/>
             <label text="Edit Hockey" />
+            <space />
             <key key="sport" value="hockey" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="ice_rink,pitch,sports_centre,stadium" />
+            <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" />
         </item>
         <item name="Pelota" icon="presets/pelota.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=pelota"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=pelota"/>
             <label text="Edit Pelota" />
+            <space />
             <key key="sport" value="pelota" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Racquet" icon="presets/racquetball.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=racquet"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=racquet"/>
             <label text="Edit Racquet" />
+            <space />
             <key key="sport" value="racquet" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item>
         <item name="Table Tennis" icon="presets/table_tennis.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=table_tennis"/>
             <label text="Edit Table Tennis" />
+            <space />
             <key key="sport" value="table_tennis" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item>
         <item name="Tennis" icon="presets/tennis.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=tennis"/>
             <label text="Edit Tennis" />
+            <space />
             <key key="sport" value="tennis" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
     </group> <!-- Sport (Ball) -->
     <group name="Motorsport" icon="presets/motorbike.png">
         <item name="Motorsport" icon="styles/standard/sport/motor.png" type="node,closedway">
             <label text="Edit Motorsport" />
+            <space />
             <key key="sport" value="motor" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
         </item>
         <item name="Karting" icon="presets/karting.png" type="node,closedway">
             <label text="Edit Karting" />
+            <space />
             <key key="sport" value="karting" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,track" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
         </item>
         <item name="Motocross" icon="styles/standard/sport/motocross.png" type="node,closedway">
             <label text="Edit Motocross" />
+            <space />
             <key key="sport" value="motocross" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,track" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
         </item>
         <item name="Safety Training" icon="presets/safety_training.png" type="node,closedway">
             <label text="Edit Safety Training" />
+            <space />
             <key key="sport" value="safety_training" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,track" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
         </item>
         <separator/>
         <item name="Model Aerodrome" icon="presets/plane.png" type="node,closedway">
             <label text="Edit Model Aerodrome" />
+            <space />
             <key key="sport" value="model_aerodrome" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,track" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="aerialway" />
         </item>
         <item name="RC Car" icon="presets/car.png" type="node,closedway">
             <label text="Edit RC Car" />
+            <space />
             <key key="sport" value="rc_car" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,track" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
         </item>
     </group> <!-- Motorsport -->
   </group> <!-- Sports -->
@@ -4692,6 +4816,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:building"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:building" />
             <label text="Edit Building" />
+            <space />
             <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,farm,transportation,greenhouse,office,university,hospital,warehouse,retail" default="yes" match="keyvalue" />
             <text key="name" text="Name" />
         </item>
@@ -4706,7 +4831,8 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:building"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:building" />
             <label text="Edit Residential Building" />
-            <combo key="building" text="Building" values="residential,apartments,house,hut,terrace,detached,roof" default="residential" match="keyvalue" />
+            <space />
+            <combo key="building" text="Building" values="residential,apartments,house,hut,terrace,detached,roof" default="residential" match="keyvalue" values_context="building" />
             <text key="name" text="Name" />
         </item>
         <item name="Entrance" icon="styles/standard/misc/entrance-yes.png" type="node">
@@ -4717,12 +4843,14 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:entrance"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:entrance" />
             <label text="Edit Entrance" />
-            <combo key="entrance" text="Entrance" values="yes,main,service,exit,emergency" default="yes" match="key" />
+            <space />
+            <combo key="entrance" text="Entrance" values="yes,main,service,exit,emergency" values_context="entrance" default="yes" match="key" />
             <combo key="access" text="Access" values="yes,delivery,private,no" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
         </item>
         <item name="Tower" icon="presets/tower.png" type="node,closedway">
             <label text="Edit Tower" />
+            <space />
             <key key="man_made" value="tower" />
             <text key="name" text="Name" />
             <combo key="tower:type" text="Tower type" values="communication,observation" />
@@ -4739,6 +4867,7 @@
         <separator/>
         <item name="Works" icon="presets/works.png" type="node,closedway">
             <label text="Edit Works" />
+            <space />
             <key key="man_made" value="works" />
             <text key="name" text="Name" />
         </item>
@@ -4757,11 +4886,13 @@
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:man_made=windmill"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=windmill" />
             <label text="Edit Windmill" />
+            <space />
             <key key="man_made" value="windmill" />
             <text key="name" text="Name" />
         </item>
         <item name="Gasometer" icon="presets/gasometer.png" type="node,closedway">
             <label text="Edit Gasometer" />
+            <space />
             <key key="man_made" value="gasometer" />
             <text key="name" text="Name" />
         </item>
@@ -4771,6 +4902,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=pipeline"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=pipeline"/>
             <label text="Edit Pipeline" />
+            <space />
             <key key="man_made" value="pipeline" />
             <text key="operator" text="Operator" />
             <combo key="type" text="Type" values="water,gas,heat,oil,sewage" />
@@ -4781,6 +4913,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=crane"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=crane" />
             <label text="Edit Crane" />
+            <space />
             <key key="man_made" value="crane" />
             <text key="name" text="Name" />
         </item>
@@ -4789,6 +4922,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=mineshaft"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=mineshaft" />
             <label text="Edit Mineshaft" />
+            <space />
             <key key="man_made" value="mineshaft" />
             <text key="name" text="Name" />
             <combo key="mineshaft_type" text="Function" values="winding,air" />
@@ -4804,6 +4938,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=adit"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=adit" />
             <label text="Edit Adit" />
+            <space />
             <key key="man_made" value="adit" />
             <text key="name" text="Name" />
             <text key="length" text="Length in meters" />
@@ -4814,6 +4949,7 @@
         <separator/>
         <item name="Water Tower" icon="presets/water_tower.png" type="node,closedway">
             <label text="Edit Water Tower" />
+            <space />
             <key key="man_made" value="water_tower" />
             <text key="name" text="Name" />
         </item>
@@ -4837,6 +4973,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=wastewater_plant"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=wastewater_plant" />
             <label text="Edit Wastewater Plant" />
+            <space />
             <key key="man_made" value="wastewater_plant" />
             <text key="name" text="Name" />
         </item>
@@ -4858,6 +4995,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=fountain"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fountain" />
             <label text="Edit Fountain" />
+            <space />
             <key key="amenity" value="fountain" />
             <text key="name" text="Name" />
         </item>
@@ -4867,6 +5005,7 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=water_well"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=water_well" />
             <label text="Edit Water Well" />
+            <space />
             <key key="man_made" value="water_well" />
             <text key="name" text="Name" />
         </item>
@@ -4877,6 +5016,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=lighthouse"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=lighthouse" />
             <label text="Edit Lighthouse" />
+            <space />
             <key key="man_made" value="lighthouse" />
             <text key="name" text="Name" />
         </item>
@@ -4885,6 +5025,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=beacon"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=beacon" />
             <label text="Edit Beacon" />
+            <space />
             <key key="man_made" value="beacon" />
             <text key="name" text="Name" />
         </item>
@@ -4906,13 +5047,14 @@
             <text key="operator" text="Operator" />             
             <combo key="measurement" text="Measurement" values="particulate_matter,seismic,water_level,weather" />
             <combo key="recording" text="Recording" values="manually,automated,remote,no" />  
-            <combo key="display" text="Display" values="analog,digital,no" values_context="display" />                                     
-       </item>                	
+            <combo key="display" text="Display" values="analog,digital,no" />
+        </item>
         <item name="Survey Point" icon="presets/survey_point.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=survey_point"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=survey_point" />
             <label text="Edit Survey Point" />
+            <space />
             <key key="man_made" value="survey_point" />
             <text key="name" text="Name" />
         </item>
@@ -4921,6 +5063,7 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=surveillance"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=surveillance" />
             <label text="Edit Surveillance Camera" />
+            <space />
             <key key="man_made" value="surveillance" />
             <text key="name" text="Name" />
             <combo key="surveillance" text="Type" values="indoor,outdoor,public" />
@@ -4930,6 +5073,7 @@
         <item name="Power Plant" icon="presets/power.png" type="closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=plant" />
             <label text="Edit Power Plant" />
+            <space />
             <key key="power" value="plant" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -4958,6 +5102,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=generator"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=generator" />
             <label text="Edit Power Generator" />
+            <space />
             <key key="power" value="generator" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -5029,17 +5174,17 @@
                 <list_entry value="RBMK-1500" display_value="Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)" short_description="nuclear fission" />
                 <list_entry value="VVER" display_value="Vodo-Vodyanoi Energetichesky Reactor (VVER)" short_description="nuclear fission" />
             </combo>
-            <space />
-            <label text="Output forms of energy" />
-            <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="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
+            <optional text="Output forms of energy:">
+                <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="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
+            </optional>
         </item>
         <item name="Power Sub Station" icon="presets/power.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
@@ -5049,6 +5194,7 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=sub_station"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=sub_station" />
             <label text="Edit Power Sub Station" />
+            <space />
             <key key="power" value="sub_station" />
             <text key="operator" text="Operator" />
             <text key="ref" text="Line reference" />
@@ -5060,6 +5206,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable_distribution_cabinet"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=cable_distribution_cabinet" />
             <label text="Edit Cable Distribution Cabinet" />
+            <space />
             <key key="power" value="cable_distribution_cabinet" />
             <text key="operator" text="Operator" />
             <text key="ref" text="Reference" />
@@ -5076,6 +5223,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=tower"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=tower" />
             <label text="Edit Power Tower" />
+            <space />
             <key key="power" value="tower" />
             <text key="operator" text="Operator" />
             <text key="ref" text="Tower reference" />
@@ -5091,6 +5239,7 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=pole"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=pole" />
             <label text="Edit Power Pole" />
+            <space />
             <key key="power" value="pole" />
             <text key="operator" text="Operator" />
             <text key="ref" text="Pole reference" />
@@ -5106,7 +5255,8 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=line"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=line" />
             <label text="Edit Power Line" />
-            <combo key="power" text="Line type" values_context="Power Line" values="line,minor_line" default="line" match="keyvalue" />
+            <space />
+            <combo key="power" text="Line type" values="line,minor_line" default="line" match="keyvalue" />
             <text key="operator" text="Operator" />
             <text key="ref" text="Line reference" />
             <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,20000,15000,750,400,220,110,high,medium,low,750000;200000,110000;20000" />
@@ -5121,12 +5271,14 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=castle" />
             <label text="Edit Castle" />
+            <space />
             <key key="historic" value="castle" />
             <text key="name" text="Name" />
             <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="Ruins" icon="presets/ruins.png" type="node,closedway">
             <label text="Edit Ruins" />
+            <space />
             <key key="historic" value="ruins" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5138,6 +5290,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=archaeological_site"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=archaeological_site" />
             <label text="Edit Archaeological Site" />
+            <space />
             <key key="historic" value="archaeological_site" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5149,18 +5302,21 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=battlefield"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=battlefield" />
             <label text="Edit Battlefield" />
+            <space />
             <key key="historic" value="battlefield" />
             <text key="name" text="Name" />
         </item>
         <item name="Palaeontological Site" icon="presets/palaeontological_site.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
             <label text="Edit Palaeontological Site" />
+            <space />
             <key key="geological" value="palaeontological_site" />
             <text key="name" text="Name" />
         </item>
         <separator/>
         <item name="Monument" icon="presets/monument.png" type="node,closedway">
             <label text="Edit Monument" />
+            <space />
             <key key="historic" value="monument" />
             <text key="name" text="Name" />
         </item>
@@ -5171,21 +5327,25 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=memorial"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=memorial" />
             <label text="Edit Memorial" />
+            <space />
             <key key="historic" value="memorial" />
             <text key="name" text="Name" />
         </item>
         <item name="Wayside Cross" icon="presets/wayside_cross.png" type="node,closedway">
             <label text="Edit Wayside Cross" />
+            <space />
             <key key="historic" value="wayside_cross" />
             <text key="name" text="Name" />
         </item>
         <item name="Wayside Shrine" icon="presets/wayside_shrine.png" type="node,closedway">
             <label text="Edit Wayside Shrine" />
+            <space />
             <key key="historic" value="wayside_shrine" />
             <text key="name" text="Name" />
         </item>
         <item name="Boundary Stone" icon="styles/standard/historic/boundary_stone.png" type="node,closedway">
             <label text="Edit Boundary Stone" />
+            <space />
             <key key="historic" value="boundary_stone" />
             <text key="name" text="Name" />
         </item>
@@ -5195,6 +5355,7 @@
     <group name="Food" icon="styles/standard/shop/supermarket.png">
         <item name="Supermarket" icon="styles/standard/shop/supermarket.png" type="node,closedway">
             <label text="Edit Supermarket" />
+            <space />
             <key key="shop" value="supermarket" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5205,6 +5366,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=convenience"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=convenience" />
             <label text="Edit Convenience Store" />
+            <space />
             <key key="shop" value="convenience" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5216,6 +5378,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=kiosk"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=kiosk" />
             <label text="Edit Kiosk" />
+            <space />
             <key key="shop" value="kiosk" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5231,6 +5394,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=bakery"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=bakery" />
             <label text="Edit Baker" />
+            <space />
             <key key="shop" value="bakery" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5244,6 +5408,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=butcher"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=butcher" />
             <label text="Edit Butcher" />
+            <space />
             <key key="shop" value="butcher" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5275,6 +5440,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=confectionery"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=confectionery" />
             <label text="Edit Confectionery" />
+            <space />
             <key key="shop" value="confectionery" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5327,11 +5493,13 @@
         <item name="Organic" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Key:organic" />
             <label text="Edit Organic/Bio" />
+            <space />
             <combo text="Organic/Bio" key="organic" values="no,yes,only" match="key" />
         </item>
         <item name="Fair Trade" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Key:fair_trade" />
             <label text="Edit Fair Trade" />
+            <space />
             <combo text="Fair Trade" key="fair_trade" values="no,yes,only" match="key" />
         </item>
         <separator/>
@@ -5340,12 +5508,14 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=alcohol"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=alcohol" />
             <label text="Edit Alcohol Shop" />
+            <space />
             <key key="shop" value="alcohol" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Beverages" icon="styles/standard/shop/beverages.png" type="node,closedway">
             <label text="Edit Beverages Shop" />
+            <space />
             <key key="shop" value="beverages" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5354,6 +5524,7 @@
     <group name="Clothes" icon="styles/standard/shop/clothes.png">
         <item name="Clothes" icon="styles/standard/shop/clothes.png" type="node,closedway">
             <label text="Edit Clothes Shop" />
+            <space />
             <key key="shop" value="clothes" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5372,6 +5543,7 @@
         </item>            
          <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway">
             <label text="Edit Shoe Shop" />
+            <space />
             <key key="shop" value="shoes" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5381,12 +5553,14 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=outdoor"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=outdoor" />
             <label text="Edit Outdoor Shop" />
+            <space />
             <key key="shop" value="outdoor" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Sports" icon="presets/rowing.png" type="node,closedway">
             <label text="Edit Sports Shop" />
+            <space />
             <key key="shop" value="sports" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5398,6 +5572,7 @@
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=dry_cleaning"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=dry_cleaning" />
             <label text="Edit Dry Cleaning" />
+            <space />
             <key key="shop" value="dry_cleaning" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5405,12 +5580,14 @@
         <item name="Laundry" icon="presets/laundry.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
             <label text="Edit Laundry" />
+            <space />
             <key key="shop" value="laundry" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Tailor" icon="styles/standard/shop/tailor.png" type="node,closedway">
             <label text="Edit Tailor" />
+            <space />
             <key key="shop" value="tailor" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5429,12 +5606,14 @@
     <group name="Electronic" icon="styles/standard/shop/electronics.png">
         <item name="Computer" icon="styles/standard/shop/computer.png" type="node,closedway">
             <label text="Edit Computer Shop" />
+            <space />
             <key key="shop" value="computer" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway">
             <label text="Edit Electronics Shop" />
+            <space />
             <key key="shop" value="electronics" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5462,12 +5641,14 @@
         </item>        
         <item name="Hifi" icon="styles/standard/shop/hifi.png" type="node,closedway">
             <label text="Edit Hifi Shop" />
+            <space />
             <key key="shop" value="hifi" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
-        <item name="Video" name_context="shop" icon="styles/standard/shop/video.png" type="node,closedway">
+        <item name="Video" icon="styles/standard/shop/video.png" type="node,closedway">
             <label text="Edit Video Shop" />
+            <space />
             <key key="shop" value="video" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5484,8 +5665,10 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bank"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bank" />
             <label text="Edit Bank" />
+            <space />
             <key key="amenity" value="bank" />
             <text key="name" text="Name" />
+            <text key="brand" text="Brand" />
             <text key="operator" text="Operator" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
             <check key="atm" text="Automated Teller Machine" default="on" />
@@ -5498,6 +5681,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bureau_de_change"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bureau_de_change" />
             <label text="Edit Money Exchange" />
+            <space />
             <key key="amenity" value="bureau_de_change" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5514,8 +5698,11 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=atm"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=atm" />
             <label text="Edit Automated Teller Machine" />
+            <space />
             <key key="amenity" value="atm" />
+            <text key="brand" text="Brand" />
             <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
     </group> <!-- Cash -->
     <group name="Other" icon="styles/standard/shop/mall.png">
@@ -5547,18 +5734,21 @@
         <separator/>
         <item name="Chemist" icon="styles/standard/shop/chemist.png" type="node,closedway">
             <label text="Edit Chemist" />
+            <space />
             <key key="shop" value="chemist" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Hairdresser" icon="styles/standard/shop/hairdresser.png" type="node,closedway">
             <label text="Edit Hairdresser" />
+            <space />
             <key key="shop" value="hairdresser" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway">
             <label text="Edit Optician" />
+            <space />
             <key key="shop" value="optician" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5592,6 +5782,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=florist"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=florist" />
             <label text="Edit Florist" />
+            <space />
             <key key="shop" value="florist" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5602,8 +5793,10 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=garden_centre"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=garden_centre" />
             <label text="Edit Garden Centre" />
+            <space />
             <key key="shop" value="garden_centre" />
             <text key="name" text="Name" />
+            <text key="brand" text="Brand" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <separator/>
@@ -5613,14 +5806,17 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=doityourself"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=doityourself" />
             <label text="Edit Do-it-yourself-store" />
+            <space />
             <key key="shop" value="doityourself" />
             <text key="name" text="Name" />
+            <text key="brand" text="Brand" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Hardware" icon="presets/hardware.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hardware" />
             <label text="Edit Hardware Store" />
+            <space />
             <key key="shop" value="hardware" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5638,8 +5834,10 @@
         <separator/>
         <item name="Furniture" icon="styles/standard/shop/furniture.png" type="node,closedway">
             <label text="Edit Furniture Shop" />
+            <space />
             <key key="shop" value="furniture" />
             <text key="name" text="Name" />
+            <text key="brand" text="Brand" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Kitchen" icon="presets/kitchen.png" type="node,closedway">
@@ -5650,6 +5848,7 @@
             <space />            
             <key key="shop" value="kitchen" />
             <text key="name" text="Name" />            
+            <text key="brand" text="Brand" />
             <text key="operator" text="Operator" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
         </item>                   
@@ -5676,6 +5875,7 @@
         <separator/>
         <item name="Stationery" icon="presets/stationery.png" type="node,closedway">
             <label text="Edit Stationery Shop" />
+            <space />
             <key key="shop" value="stationery" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5692,8 +5892,10 @@
         </item>
         <item name="Book Store" icon="presets/book.png" type="node,closedway">
             <label text="Edit Book Store" />
+            <space />
             <key key="shop" value="books" />
             <text key="name" text="Name" />
+            <text key="brand" text="Brand" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Newsagent's shop" icon="presets/kiosk.png" type="node,closedway">
@@ -5703,6 +5905,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=newsagent"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=newsagent" />
             <label text="Edit Newsagent's shop" />
+            <space />
             <key key="shop" value="newsagent" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5710,8 +5913,10 @@
         <separator/>
         <item name="Travel Agency" icon="presets/travel.png" type="node,closedway">
             <label text="Edit Travel Agency" />
+            <space />
             <key key="shop" value="travel_agency" />
             <text key="name" text="Name" />
+            <text key="brand" text="Brand" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Musical Instrument" icon="presets/musical_instrument.png" type="node,closedway">
@@ -5726,6 +5931,7 @@
         </item>                                    
         <item name="Toys" icon="styles/standard/shop/toys.png" type="node,closedway">
             <label text="Edit Toy Shop" />
+            <space />            
             <key key="shop" value="toys" />
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
@@ -5747,6 +5953,7 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=vending_machine"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=vending_machine" />
         <label text="Edit Vending machine" />
+        <space />            
         <key key="amenity" value="vending_machine" />
         <multiselect key="vending" text="Vending products" values="animal_food;bicycle_tube;cigarettes;condoms;drinks;excrement_bags;food;news_papers;parking_tickets;photos;public_transport_plans;public_transport_tickets;SIM-cards;stamps;sweets;tampons;telephone_vouchers;toys;vouchers" />
         <text key="operator" text="Operator" />
@@ -5939,6 +6146,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=peak"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=peak" />
             <label text="Edit Peak" />
+            <space />
             <key key="natural" value="peak" />
             <text key="name" text="Name" />
             <text key="ele" text="Elevation" />
@@ -5948,6 +6156,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=glacier" />
             <label text="Edit Glacier" />
+            <space />
             <key key="natural" value="glacier" />
             <text key="name" text="Name" />
             <text key="ele" text="Elevation" />
@@ -5958,6 +6167,7 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=volcano"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=volcano" />
             <label text="Edit Volcano" />
+            <space />
             <key key="natural" value="volcano" />
             <text key="name" text="Name" />
             <text key="ele" text="Elevation" />
@@ -5967,6 +6177,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=cave_entrance" />
             <label text="Edit Cave Entrance" />
+            <space />
             <key key="natural" value="cave_entrance" />
             <text key="name" text="Name" />
             <text key="wikipedia" text="Wikipedia" />
@@ -6006,11 +6217,17 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=tree"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=tree" />
             <label text="Edit Tree" />
+            <space />
             <key key="natural" value="tree" />
             <text key="name" text="Name" />
-            <text key="type" text="Type" />
+	    <combo key="type" text="Type" values="broad_leaved,conifer,palm" />
             <text key="height" text="Height in meter (m)" />
             <text key="name:botanical" text="Botanical Name" />
+            <optional>
+                <text key="genus" text="Genus" />
+                <text key="species" text="Species" />
+                <text key="taxon" text="Taxon" />
+            </optional>
         </item>
         <item name="Wood" icon="presets/landuse.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
@@ -6019,9 +6236,10 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=wood"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=wood" />
             <label text="Edit Wood" />
+            <space />
             <key key="natural" value="wood" />
             <text key="name" text="Name" />
-            <combo key="wood" text="Type" values="coniferous,deciduous,mixed" values_context="wood" />
+            <combo key="wood" text="Type" values="coniferous,deciduous,mixed" />
         </item>
         <item name="Forest" icon="presets/landuse.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
@@ -6051,12 +6269,14 @@
         </item>
         <item name="Nature Reserve" icon="styles/standard/leisure/nature_reserve.png" type="node,closedway,relation">
             <label text="Edit Nature Reserve" />
+            <space />
             <key key="leisure" value="nature_reserve" />
             <text key="name" text="Name" />
         </item>
         <separator/>
         <item name="Scree" icon="presets/empty.png" type="node,closedway,relation">
             <label text="Edit Scree" />
+            <space />
             <key key="natural" value="scree" />
             <text key="name" text="Name" />
         </item>
@@ -6066,11 +6286,13 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=fell"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=fell" />
             <label text="Edit Fell" />
+            <space />
             <key key="natural" value="fell" />
             <text key="name" text="Name" />
         </item>
         <item name="Scrub" icon="presets/empty.png" type="node,closedway,relation">
             <label text="Edit Scrub" />
+            <space />
             <key key="natural" value="scrub" />
             <text key="name" text="Name" />
         </item>
@@ -6081,6 +6303,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=heath"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=heath" />
             <label text="Edit Heath" />
+            <space />
             <key key="natural" value="heath" />
             <text key="name" text="Name" />
         </item>
@@ -6147,6 +6370,7 @@
         <separator/>
         <item name="Garden" icon="presets/empty.png" type="node,closedway,relation">
             <label text="Edit Garden" />
+            <space />
             <key key="leisure" value="garden" />
             <text key="name" text="Name" />
         </item>
@@ -6170,11 +6394,13 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=common" />
             <label text="Edit Common" />
+            <space />
             <key key="leisure" value="common" />
             <text key="name" text="Name" />
         </item>
         <item name="Park" icon="presets/empty.png" type="node,closedway,relation">
             <label text="Edit Park" />
+            <space />
             <key key="leisure" value="park" />
             <text key="name" text="Name" />
         </item>
@@ -6190,7 +6416,7 @@
             <text key="name" text="Name" />
         </item>
         <separator/>
-        <item name="Residential area" icon="styles/standard/misc/landmark/building.png" type="closedway,relation">
+        <item name="Residential Area" icon="styles/standard/misc/landmark/building.png" type="closedway,relation">
             <label text="Edit Residential Landuse" />
             <space />
             <key key="landuse" value="residential" />
@@ -6205,6 +6431,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=grave_yard"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=grave_yard" />
             <label text="Edit Graveyard" />
+            <space />
             <key key="amenity" value="grave_yard" />
             <text key="name" text="Name" />
             <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
@@ -6381,6 +6608,7 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:boundary"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:boundary" />
             <label text="Edit Boundary" />
+            <space />
             <key key="type" value="boundary" />
             <text key="name" text="Name" />
             <optional>
@@ -6398,6 +6626,7 @@
         <item name="Site" type="relation">
             <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Site"/>
             <label text="Edit Site" />
+            <space />
             <key key="type" value="site" />
             <text key="name" text="Site name" />
             <roles>
@@ -6419,6 +6648,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Relation:restriction"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:restriction"/>
             <label text="Edit Turn Restriction" />
+            <space />
             <key key="type" value="restriction" />
             <combo key="restriction" text="Restriction" values="no_left_turn,no_right_turn,no_straight_on,no_u_turn,only_right_turn,only_left_turn,only_straight_on" />
             <optional>
@@ -6437,6 +6667,7 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:enforcement"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:enforcement"/>
             <label text="Edit Enforcement" />
+            <space />
             <key key="type" value="enforcement" />
             <combo key="enforcement" text="Type of enforcement" values="maxheight,maxweight,maxspeed,mindistance,traffic_signals,check " />
             <text key="maxheight" text="Max. height (meters, only if enforcement=maxheight)" />
@@ -6459,6 +6690,7 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:route"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:route"/>
             <label text="Edit general route" />
+            <space />
             <key key="type" value="route" />
             <combo key="route" text="Route type" values="bicycle,bus,road,ferry,ski,foot,hiking,tram,detour,railway,subway" />
             <text key="name" text="Name" />
@@ -6484,9 +6716,10 @@
                 <role key="backward_stop" text="backward halt point" requisite="optional" type="node" />
             </roles>
         </item>
-        <item name="Route network" icon="presets/path.png" type="relation">
+        <item name="Route Network" icon="presets/path.png" type="relation">
             <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network"/>
-            <label text="Edit route network" />
+            <label text="Edit Route Network" />
+            <space />
             <key key="type" value="network" />
             <text key="name" text="Name" />
             <optional>
@@ -6498,12 +6731,13 @@
             </roles>
         </item>
         <separator/>
-        <item name="Associated street" icon="presets/addresses.png" type="relation">
+        <item name="Associated Street" icon="presets/addresses.png" type="relation">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:associatedStreet"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:associatedStreet"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:associatedStreet"/>
-            <label text="Edit associated street" />
+            <label text="Edit Associated Street" />
+            <space />
             <key key="type" value="associatedStreet" />
             <text key="name" text="Street name" />
             <roles>
@@ -6515,6 +6749,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Relation:street"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:street"/>
             <label text="Edit Street" />
+            <space />
             <key key="type" value="street" />
             <text key="name" text="Name" />
             <roles>
@@ -6531,7 +6766,8 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:destination_sign"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:destination_sign"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:destination_sign"/>
-            <label text="Edit Destination sign" />
+            <label text="Edit Destination Sign" />
+            <space />
             <key key="type" value="destination_sign" />
             <text key="destination" text="Destination written on sign (w/o distance)" />
             <text key="distance" text="Distance (km)" />
@@ -6550,8 +6786,9 @@
         <item name="Waterway" icon="presets/river.png" type="relation">
             <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Waterway"/>
             <label text="Edit Waterway" />
+            <space />
             <key key="type" value="waterway" />
-            <combo key="waterway" text="Subtype of waterway (largest one of members)" values="river,stream,canal,drain,ditch" />
+            <combo key="waterway" text="Subtype of waterway (largest one of members)" values="river,stream,canal,drain,ditch" values_context="waterway" />
             <text key="name" text="Name" />
             <optional>
                 <text key="destination" text="Name of river/sea/ocean" />
@@ -6574,6 +6811,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relations/Proposed/Bridges_and_Tunnels"/>
             <label text="Edit Bridge" />
+            <space />
             <key key="type" value="bridge" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
             <text key="name" text="Name" />
@@ -6591,6 +6829,7 @@
         <item name="Tunnel" icon="presets/tunnel.png" type="relation">
             <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels"/>
             <label text="Edit Tunnel" />
+            <space />
             <key key="type" value="tunnel" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
             <text key="name" text="Name" />