Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 6823)
+++ /trunk/data/defaultpresets.xml	(revision 6824)
@@ -18,4 +18,6 @@
   name_template: define custom formatting for OSM primitives
                  see http://josm.openstreetmap.de/wiki/NameTemplate
+  preset_name_label: whether to insert "Edit [preset name]" label in dialog
+                     (defaults to "false" for backward-compatibility on external presets)
 
 group: a group of items (same syntax as "item")
@@ -358,5 +360,5 @@
   <group name="Highways" icon="presets/way_secondary.png">
     <group name="Streets" icon="presets/way_secondary.png">
-        <item name="Motorway" icon="presets/motorway.png" type="way">
+        <item name="Motorway" icon="presets/motorway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway"
@@ -369,5 +371,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=motorway"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=motorway" />
-            <label text="Edit Motorway" />
             <space />
             <key key="highway" value="motorway" />
@@ -387,5 +388,5 @@
             </optional>
         </item>
-        <item name="Motorway Link" icon="presets/motorway.png" type="way">
+        <item name="Motorway Link" icon="presets/motorway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link"
@@ -397,5 +398,4 @@
                   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" />
             <key key="highway" value="motorway_link" />
             <optional>
@@ -412,5 +412,5 @@
             </optional>
         </item>
-        <item name="Trunk" icon="presets/trunk.png" type="way">
+        <item name="Trunk" icon="presets/trunk.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk"
@@ -422,5 +422,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=trunk"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=trunk" />
-            <label text="Edit Trunk" />
             <space />
             <key key="highway" value="trunk" />
@@ -441,5 +440,5 @@
             </optional>
         </item>
-        <item name="Trunk Link" icon="presets/trunk.png" type="way">
+        <item name="Trunk Link" icon="presets/trunk.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Link_(highway)"
@@ -449,5 +448,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Link_(highway)"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)" />
-            <label text="Edit Trunk Link" />
             <space />
             <key key="highway" value="trunk_link" />
@@ -468,5 +466,5 @@
         </item>
         <separator/>
-        <item name="Primary" icon="presets/way_primary.png" type="way">
+        <item name="Primary" icon="presets/way_primary.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary"
@@ -478,5 +476,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=primary"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=primary" />
-            <label text="Edit Primary Road" />
             <space />
             <key key="highway" value="primary" />
@@ -489,5 +486,5 @@
             </optional>
         </item>
-        <item name="Primary Link" icon="presets/way_primary.png" type="way">
+        <item name="Primary Link" icon="presets/way_primary.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Link_(highway)"
@@ -497,5 +494,4 @@
                   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" />
             <key key="highway" value="primary_link" />
             <optional>
@@ -505,5 +501,5 @@
             </optional>
         </item>
-        <item name="Secondary" icon="presets/way_secondary.png" type="way">
+        <item name="Secondary" icon="presets/way_secondary.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=secondary"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
@@ -516,5 +512,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=secondary"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=secondary" />
-            <label text="Edit Secondary Road" />
             <space />
             <key key="highway" value="secondary" />
@@ -526,5 +521,5 @@
             </optional>
         </item>
-        <item name="Secondary Link" icon="presets/way_secondary.png" type="way">
+        <item name="Secondary Link" icon="presets/way_secondary.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Link_(highway)"
@@ -534,5 +529,4 @@
                   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" />
             <key key="highway" value="secondary_link" />
             <optional>
@@ -541,5 +535,5 @@
             </optional>
         </item>
-        <item name="Tertiary" icon="presets/way_tertiary.png" type="way">
+        <item name="Tertiary" icon="presets/way_tertiary.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=tertiary"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:highway=tertiary"
@@ -553,5 +547,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=tertiary"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=tertiary" />
-            <label text="Edit Tertiary Road" />
             <space />
             <key key="highway" value="tertiary" />
@@ -563,5 +556,5 @@
             </optional>
         </item>
-        <item name="Tertiary Link" icon="presets/way_tertiary.png" type="way">
+        <item name="Tertiary Link" icon="presets/way_tertiary.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Link_(highway)"
@@ -571,5 +564,4 @@
                   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" />
             <key key="highway" value="tertiary_link" />
             <optional>
@@ -578,5 +570,5 @@
             </optional>
         </item>
-        <item name="Unclassified" icon="presets/way_unclassified.png" type="way,closedway">
+        <item name="Unclassified" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=unclassified"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
@@ -588,5 +580,4 @@
                   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" />
             <key key="highway" value="unclassified" />
             <optional>
@@ -599,5 +590,5 @@
             </optional>
         </item>
-        <item name="Residential" icon="presets/residential.png" type="way,closedway">
+        <item name="Residential" icon="presets/residential.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential"
@@ -609,5 +600,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=residential"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=residential" />
-            <label text="Edit Residential Street" />
             <space />
             <key key="highway" value="residential" />
@@ -620,9 +610,8 @@
             </optional>
         </item>
-        <item name="Bicycle Road" icon="presets/bicycle_road.svg" type="way">
+        <item name="Bicycle Road" icon="presets/bicycle_road.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:bicycle_road"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bicycle_road"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:bicycle_road" />
-            <label text="Edit Bicycle Road" />
             <space />
             <key key="bicycle_road" value="yes" />
@@ -643,5 +632,5 @@
             </optional>
         </item>
-        <item name="Living Street" icon="presets/living_street.png" type="way,closedway">
+        <item name="Living Street" icon="presets/living_street.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street"
@@ -652,5 +641,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=living_street"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=living_street" />
-            <label text="Edit Living Street" />
             <space />
             <key key="highway" value="living_street" />
@@ -664,5 +652,5 @@
             </optional>
         </item>
-        <item name="Pedestrian" icon="presets/pedestrian.png" type="way,closedway,relation">
+        <item name="Pedestrian" icon="presets/pedestrian.png" type="way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian"
@@ -675,5 +663,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=pedestrian"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=pedestrian" />
-            <label text="Edit Pedestrian Street" />
             <space />
             <key key="highway" value="pedestrian" />
@@ -689,5 +676,5 @@
             </optional>
         </item>
-        <item name="Service" icon="presets/way_unclassified.png" type="way,closedway">
+        <item name="Service" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service"
@@ -698,5 +685,4 @@
                   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 Service Way" />
             <space />
             <key key="highway" value="service" />
@@ -710,5 +696,5 @@
             </optional>
         </item>
-        <item name="Parking Aisle" icon="presets/way_unclassified.png" type="way,closedway">
+        <item name="Parking Aisle" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:service=parking_aisle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
@@ -719,5 +705,4 @@
                   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" />
             <key key="highway" value="service" />
             <key key="service" value="parking_aisle" />
@@ -728,5 +713,5 @@
             </optional>
         </item>
-        <item name="Road (Unknown Type)" icon="presets/way_unclassified.png" type="way,closedway">
+        <item name="Road (Unknown Type)" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road"
@@ -737,5 +722,4 @@
                   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" />
             <key key="highway" value="road" />
             <optional>
@@ -745,5 +729,5 @@
             </optional>
         </item>
-        <item name="Construction" icon="presets/construction.png" type="way,closedway">
+        <item name="Construction" icon="presets/construction.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:construction"
@@ -753,5 +737,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:construction"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:construction" />
-            <label text="Edit Highway Under Construction" />
             <key key="highway" value="construction" />
             <optional>
@@ -764,5 +747,5 @@
         </item>
         <separator/>
-        <item name="Road Restrictions" icon="presets/restrictions.png" type="node,way">
+        <item name="Road Restrictions" icon="presets/restrictions.png" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:access"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Key:access"
@@ -776,5 +759,4 @@
                   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" />
@@ -812,5 +794,5 @@
         </item>
         <separator/>
-        <item name="Roundabout" icon="presets/roundabout.png" type="node,closedway">
+        <item name="Roundabout" icon="presets/roundabout.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=roundabout"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:junction=roundabout"
@@ -823,5 +805,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:junction=roundabout"
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:junction=roundabout" />
-            <label text="Edit Junction" />
             <space />
             <key key="junction" value="roundabout" />
@@ -834,5 +815,5 @@
             </optional>
         </item>
-        <item name="Bridge" icon="presets/bridge.png" type="way">
+        <item name="Bridge" icon="presets/bridge.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:bridge"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bridge"
@@ -845,5 +826,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:bridge"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:bridge" />
-            <label text="Edit Bridge" />
             <space />
             <combo key="bridge" text="Bridge" values="yes,viaduct,suspension,swing,aqueduct" match="keyvalue" default="yes" />
@@ -858,5 +838,5 @@
             </optional>
         </item>
-        <item name="Ford" icon="presets/ford.png" type="node,way">
+        <item name="Ford" icon="presets/ford.png" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:ford"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:ford"
@@ -864,5 +844,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:ford"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:ford" />
-            <label text="Edit Ford" />
             <key key="ford" value="yes" />
             <optional>
@@ -873,5 +852,5 @@
     </group> <!-- Streets -->
     <group name="Ways" icon="presets/way_unclassified.png">
-        <item name="Track" icon="presets/track1.png" type="way,closedway">
+        <item name="Track" icon="presets/track1.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:highway=track"
@@ -886,5 +865,4 @@
                   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" />
             <space />
             <combo key="tracktype" text="Tracktype" values="grade1,grade2,grade3,grade4,grade5" />
@@ -902,5 +880,5 @@
             </optional>
         </item>
-        <item name="Path" icon="presets/path.png" type="way,closedway">
+        <item name="Path" icon="presets/path.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path"
@@ -913,5 +891,4 @@
                   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" />
             <key key="highway" value="path" />
             <optional>
@@ -940,5 +917,5 @@
         </item>
         <separator/>
-        <item name="Dedicated Bridleway" icon="presets/equestrian.png" type="way">
+        <item name="Dedicated Bridleway" icon="presets/equestrian.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:highway=bridleway"
@@ -948,5 +925,4 @@
                   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" />
             <key key="highway" value="bridleway" />
             <optional>
@@ -958,5 +934,5 @@
             </optional>
         </item>
-        <item name="Cycle Lane/Track" type="way">
+        <item name="Cycle Lane/Track" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Bicycle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Bicycle"
@@ -969,5 +945,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Bicycle"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Bicycle" />
-            <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" match="key" />
@@ -981,5 +956,5 @@
             </optional>
         </item>
-        <item name="Dedicated Cycleway" icon="presets/cycleway.png" type="way">
+        <item name="Dedicated Cycleway" icon="presets/cycleway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
@@ -990,5 +965,4 @@
                   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" />
             <key key="highway" value="cycleway" />
             <optional>
@@ -1000,9 +974,8 @@
             </optional>
         </item>
-        <item name="Segregated Foot- and Cycleway" icon="presets/foot_and_cycleway_segregated.png" type="way">
+        <item name="Segregated Foot- and Cycleway" icon="presets/foot_and_cycleway_segregated.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
                   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" />
             <key key="highway" value="path" />
             <key key="bicycle" value="designated" />
@@ -1016,9 +989,8 @@
             </optional>
         </item>
-        <item name="Combined Foot- and Cycleway" icon="presets/foot_and_cycleway_combined.png" type="way">
+        <item name="Combined Foot- and Cycleway" icon="presets/foot_and_cycleway_combined.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
                   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" />
             <key key="highway" value="path" />
             <key key="bicycle" value="designated" />
@@ -1033,5 +1005,5 @@
             </optional>
         </item>
-        <item name="Dedicated Footway" icon="presets/footway.png" type="way">
+        <item name="Dedicated Footway" icon="presets/footway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway"
@@ -1044,5 +1016,4 @@
                   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" />
             <key key="highway" value="footway" />
             <optional>
@@ -1055,5 +1026,5 @@
             </optional>
         </item>
-        <item name="Steps" icon="presets/steps.png" type="way">
+        <item name="Steps" icon="presets/steps.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=steps"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
@@ -1063,5 +1034,4 @@
                   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" />
             <key key="highway" value="steps" />
             <optional>
@@ -1075,5 +1045,5 @@
     </group> <!-- Ways -->
     <group name="Waypoints" icon="presets/waypoints.png">
-        <item name="Motorway Junction" icon="presets/motorway_exit.png" type="node">
+        <item name="Motorway Junction" icon="presets/motorway_exit.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_junction"
@@ -1081,5 +1051,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=motorway_junction"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=motorway_junction" />
-            <label text="Edit Motorway Junction" />
             <space />
             <key key="highway" value="motorway_junction" />
@@ -1088,5 +1057,5 @@
             <text key="exit_to" text="Exit to" />
         </item>
-        <item name="Services" icon="styles/standard/vehicle/services.png" type="node,closedway,relation">
+        <item name="Services" icon="styles/standard/vehicle/services.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=services"
@@ -1096,5 +1065,4 @@
                   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" />
             <key key="highway" value="services" />
             <optional>
@@ -1104,5 +1072,5 @@
             </optional>
         </item>
-        <item name="Rest Area" icon="presets/parking.png" type="node,closedway">
+        <item name="Rest Area" icon="presets/parking.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=rest_area"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=rest_area"
@@ -1113,5 +1081,4 @@
                   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" />
             <key key="highway" value="rest_area" />
             <optional>
@@ -1122,5 +1089,5 @@
         </item>
         <separator/>
-        <item name="Traffic Signal" icon="presets/traffic-light.png" type="node">
+        <item name="Traffic Signal" icon="presets/traffic-light.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_signals"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=traffic_signals"
@@ -1128,5 +1095,4 @@
                   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" />
             <key key="highway" value="traffic_signals" />
             <optional text="Optional crossing attributes:">
@@ -1138,11 +1104,11 @@
             </optional>
         </item>
-        <item name="Stop" icon="presets/Stop.png" type="node">
+        <item name="Stop" icon="presets/Stop.png" type="node" preset_name_label="true">
             <key key="highway" value="stop" />
         </item>
-        <item name="Give way" icon="styles/standard/vehicle/restriction/right_of_way.png" type="node">
+        <item name="Give way" icon="styles/standard/vehicle/restriction/right_of_way.png" type="node" preset_name_label="true">
             <key key="highway" value="give_way" />
         </item>
-        <item name="Mini-roundabout" icon="presets/roundabout_left.png" type="node">
+        <item name="Mini-roundabout" icon="presets/roundabout_left.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=mini_roundabout"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=mini_roundabout"
@@ -1152,9 +1118,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=mini_roundabout" />
             <key key="highway" value="mini_roundabout" />
-            <label text="Edit Mini-Roundabout" />
             <space />
             <combo key="direction" text="Direction" values="clockwise" />
         </item>
-        <item name="Pedestrian Crossing" icon="styles/standard/vehicle/zebra_crossing.png" type="node">
+        <item name="Pedestrian Crossing" icon="styles/standard/vehicle/zebra_crossing.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:crossing"
@@ -1166,5 +1131,4 @@
                   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 Pedestrian Crossing" />
             <space />
             <key key="highway" value="crossing" />
@@ -1175,5 +1139,5 @@
             <check key="horse" text="Cross on horseback" />
         </item>
-        <item name="Traffic Calming" icon="presets/chicane.png" type="node,way">
+        <item name="Traffic Calming" icon="presets/chicane.png" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:traffic_calming"
@@ -1185,9 +1149,8 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:traffic_calming"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:traffic_calming" />
-            <label text="Edit Traffic Calming" />
             <space />
             <combo key="traffic_calming" text="Type" values="yes,bump,chicane,choker,cushion,hump,island,rumble_strip,table" match="key" values_searchable="true" />
         </item>
-        <item name="Passing Place" icon="presets/passingplace.png" type="node">
+        <item name="Passing Place" icon="presets/passingplace.png" type="node" preset_name_label="true">
             <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"
@@ -1195,5 +1158,5 @@
             <key key="highway" value="passing_place" />
         </item>
-        <item name="Turning Circle" icon="presets/turning_circle.png" type="node">
+        <item name="Turning Circle" icon="presets/turning_circle.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_circle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle"
@@ -1203,5 +1166,5 @@
             <key key="highway" value="turning_circle" />
         </item>
-        <item name="City Limit" icon="presets/citylimit.png" type="node">
+        <item name="City Limit" icon="presets/citylimit.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign=city_limit"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:traffic_sign"
@@ -1209,5 +1172,4 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:traffic_sign"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:traffic_sign" />
-            <label text="Edit City Limit Sign" />
             <space />
             <key key="traffic_sign" value="city_limit" />
@@ -1215,5 +1177,5 @@
             <text key="alt_name" text="Second Name" />
         </item>
-        <item name="Speed Camera" icon="presets/speed_camera.png" type="node">
+        <item name="Speed Camera" icon="presets/speed_camera.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=speed_camera"
                   az.href="http://wiki.openstreetmap.org/wiki/Az:Tag:highway=speed_camera"
@@ -1228,5 +1190,5 @@
         </item>
         <separator/>
-        <item name="Grit Bin" icon="styles/standard/misc/grit_bin.png" type="node">
+        <item name="Grit Bin" icon="styles/standard/misc/grit_bin.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grit_bin"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=grit_bin"
@@ -1236,5 +1198,5 @@
         </item>
         <separator/>
-        <item name="Mountain Pass" icon="presets/mountain_pass.png" type="node">
+        <item name="Mountain Pass" icon="presets/mountain_pass.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:mountain_pass"
@@ -1243,5 +1205,4 @@
                   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" />
             <key key="mountain_pass" value="yes" />
             <optional>
@@ -1253,9 +1214,8 @@
     </group> <!-- Waypoints -->
     <group name="Barriers" icon="presets/barrier.png"> <!-- *** node barriers *** -->
-        <item name="Block" icon="presets/block.png" type="node,way,closedway">
+        <item name="Block" icon="presets/block.png" type="node,way,closedway" preset_name_label="true">
             <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" />
             <key key="barrier" value="block" />
             <reference ref="barrier_4" />
@@ -1265,5 +1225,5 @@
             </optional>
         </item> <!-- block -->
-        <item name="Bollard" icon="presets/bollard.png" type="node,way">
+        <item name="Bollard" icon="presets/bollard.png" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=bollard"
@@ -1273,5 +1233,4 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=bollard"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=bollard" />
-            <label text="Edit Bollard" />
             <space />
             <key key="barrier" value="bollard" />
@@ -1283,35 +1242,31 @@
             </optional>
         </item> <!-- bollard -->
-        <item name="Cycle Barrier" icon="styles/standard/vehicle/cycle_barrier.png" type="node">
+        <item name="Cycle Barrier" icon="styles/standard/vehicle/cycle_barrier.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=cycle_barrier"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=cycle_barrier"
                   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" />
             <key key="barrier" value="cycle_barrier" />
             <reference ref="barrier_4" />
             <reference ref="optional_maxwidth" />
         </item> <!-- cycle_barrier -->
-        <item name="Cattle Grid" icon="presets/cattle_grid.png" type="node">
+        <item name="Cattle Grid" icon="presets/cattle_grid.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=cattle_grid"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=cattle_grid"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=cattle_grid" />
-            <label text="Edit Cattle Grid" />
             <key key="barrier" value="cattle_grid" />
             <reference ref="barrier_4" />
         </item> <!-- cattle_grid -->
-        <item name="Bus Trap" icon="presets/empty.png" type="node">
+        <item name="Bus Trap" icon="presets/empty.png" type="node" preset_name_label="true">
             <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" />
             <key key="barrier" value="bus_trap" />
             <reference ref="optional_maxwidth" />
         </item> <!-- bus_trap -->
-        <item name="Spikes" icon="presets/empty.png" type="node">
-            <label text="Edit Spikes" />
+        <item name="Spikes" icon="presets/empty.png" type="node" preset_name_label="true">
             <key key="barrier" value="spikes" />
             <reference ref="barrier_5" />
         </item> <!-- spikes -->
-        <item name="Toll Booth" icon="presets/toll_station.png" type="node,closedway">
+        <item name="Toll Booth" icon="presets/toll_station.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=toll_booth"
@@ -1322,5 +1277,4 @@
                   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" />
             <key key="barrier" value="toll_booth" />
             <optional>
@@ -1329,12 +1283,11 @@
             </optional>
         </item> <!-- toll_booth -->
-        <item name="Border Control" icon="presets/douane.png" type="node">
+        <item name="Border Control" icon="presets/douane.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=border_control" />
-            <label text="Edit Border Control" />
             <key key="barrier" value="border_control" />
             <reference ref="barrier_5" />
         </item> <!-- border_control -->
         <separator/> <!-- *** linear barriers *** -->
-        <item name="Hedge" icon="presets/hedge.png" type="way,closedway,relation">
+        <item name="Hedge" icon="presets/hedge.png" type="way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=hedge"
@@ -1345,5 +1298,4 @@
                   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" />
             <key key="barrier" value="hedge" />
             <optional>
@@ -1354,5 +1306,5 @@
             </optional>
         </item> <!-- hedge -->
-        <item name="Fence" icon="presets/fence.png" type="way,closedway">
+        <item name="Fence" icon="presets/fence.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=fence"
@@ -1363,5 +1315,4 @@
                   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" />
             <key key="barrier" value="fence" />
             <optional>
@@ -1370,12 +1321,11 @@
             </optional>
         </item> <!-- fence -->
-        <item name="Guard Rail" type="way">
+        <item name="Guard Rail" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=guard_rail"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=guard_rail" />
-            <label text="Edit Guard Rail" />
             <key key="barrier" value="guard_rail" />
             <reference ref="optional_height" />
         </item> <!-- guard_rail -->
-        <item name="Wall" icon="presets/wall.png" type="way,closedway">
+        <item name="Wall" icon="presets/wall.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=wall"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=wall"
@@ -1386,18 +1336,16 @@
                   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" />
             <key key="barrier" value="wall" />
             <reference ref="optional_height" />
         </item> <!-- wall -->
-        <item name="City Wall" icon="presets/city_wall.png" type="way,closedway">
+        <item name="City Wall" icon="presets/city_wall.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=city_wall"
                   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" />
             <key key="barrier" value="city_wall" />
             <reference ref="optional_height" />
         </item> <!-- city_wall -->
-        <item name="Retaining Wall" icon="presets/retaining_wall.png" type="way,closedway">
+        <item name="Retaining Wall" icon="presets/retaining_wall.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=retaining_wall"
@@ -1407,9 +1355,8 @@
                   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" />
             <key key="barrier" value="retaining_wall" />
             <reference ref="optional_height" />
         </item> <!-- retaining_wall -->
-        <item name="Ditch" name_context="Barrier" type="way">
+        <item name="Ditch" name_context="Barrier" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=ditch"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:barrier=ditch"
@@ -1417,5 +1364,4 @@
                   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" text_context="Barrier" />
             <key key="barrier" value="ditch" />
             <optional>
@@ -1423,22 +1369,20 @@
             </optional>
         </item> <!-- ditch -->
-        <item name="Kerb" type="way,closedway">
+        <item name="Kerb" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=kerb"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=kerb" />
-            <label text="Edit Kerb" />
             <key key="barrier" value="kerb" />
             <reference ref="optional_height" />
         </item> <!-- kerb -->
         <separator/> <!-- *** access *** -->
-        <item name="Entrance (barrier opening)" icon="styles/standard/vehicle/entrance.png" type="node">
+        <item name="Entrance (barrier opening)" icon="styles/standard/vehicle/entrance.png" type="node" preset_name_label="true">
             <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)" />
             <key key="barrier" value="entrance" />
             <reference ref="barrier_5" />
             <reference ref="optional_maxwidth" />
         </item> <!-- entrance -->
-        <item name="Gate" icon="presets/gate.png" type="node">
+        <item name="Gate" icon="presets/gate.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=gate"
@@ -1448,5 +1392,4 @@
                   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" />
             <key key="barrier" value="gate" />
             <reference ref="barrier_5" />
@@ -1454,5 +1397,5 @@
             <reference ref="general_access" />
         </item> <!-- gate -->
-        <item name="Lift Gate" icon="presets/lift_gate.png" type="node">
+        <item name="Lift Gate" icon="presets/lift_gate.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=lift_gate"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=lift_gate"
@@ -1461,5 +1404,4 @@
                   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" />
             <key key="barrier" value="lift_gate" />
             <reference ref="barrier_5" />
@@ -1467,35 +1409,30 @@
             <reference ref="general_access" />
         </item> <!-- lift_gate -->
-        <item name="Hampshire Gate" icon="presets/empty.png" type="node">
-            <label text="Edit Hampshire Gate" />
+        <item name="Hampshire Gate" icon="presets/empty.png" type="node" preset_name_label="true">
             <key key="barrier" value="hampshire_gate" />
             <reference ref="barrier_5" />
             <reference ref="optional_maxwidth" />
         </item> <!-- hampshire_gate -->
-        <item name="Bump Gate" icon="presets/empty.png" type="node">
-            <label text="Edit Bump Gate" />
+        <item name="Bump Gate" icon="presets/empty.png" type="node" preset_name_label="true">
             <key key="barrier" value="bump_gate" />
             <reference ref="barrier_5" />
             <reference ref="optional_maxwidth" />
         </item> <!-- bump_gate -->
-        <item name="Kissing Gate" icon="presets/empty.png" type="node">
+        <item name="Kissing Gate" icon="presets/empty.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=kissing_gate"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=kissing_gate" />
-            <label text="Edit Kissing Gate" />
             <key key="barrier" value="kissing_gate" />
             <reference ref="barrier_2" />
             <reference ref="optional_maxwidth" />
         </item> <!-- kissing_gate -->
-        <item name="Chain" type="node">
+        <item name="Chain" type="node" preset_name_label="true">
             <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" />
             <key key="barrier" value="chain" />
             <reference ref="barrier_5" />
             <reference ref="optional_maxwidth" />
         </item> <!-- chain -->
-        <item name="Stile" icon="presets/stile.png" type="node">
+        <item name="Stile" icon="presets/stile.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-            <label text="Edit Stile" />
             <space />
             <key key="barrier" value="stile" />
@@ -1506,15 +1443,13 @@
             <reference ref="barrier_2" />
         </item> <!-- stile -->
-        <item name="Turnstile" icon="styles/standard/vehicle/turnstile.png" type="node">
+        <item name="Turnstile" icon="styles/standard/vehicle/turnstile.png" type="node" preset_name_label="true">
             <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" />
             <key key="barrier" value="turnstile" />
             <reference ref="barrier_2" />
         </item> <!-- turnstile -->
-        <item name="Sally Port" icon="styles/standard/vehicle/sally_port.png" type="node">
+        <item name="Sally Port" icon="styles/standard/vehicle/sally_port.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=sally_port" />
-            <label text="Edit Sally Port" />
             <key key="barrier" value="sally_port" />
             <reference ref="barrier_5" />
@@ -1526,5 +1461,5 @@
     </group> <!-- Barriers -->
     <group name="Passageways" icon="presets/tunnel.png">
-        <item name="Tunnel" icon="presets/tunnel.png" type="way">
+        <item name="Tunnel" icon="presets/tunnel.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
@@ -1536,5 +1471,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:tunnel"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:tunnel" />
-            <label text="Edit Tunnel" />
             <key key="tunnel" value="yes" />
             <optional>
@@ -1547,5 +1481,5 @@
             </optional>
         </item>
-        <item name="Building Passage" icon="presets/tunnel.png" type="way">
+        <item name="Building Passage" icon="presets/tunnel.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
@@ -1557,5 +1491,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:tunnel"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:tunnel" />
-            <label text="Edit Building Passage" />
             <key key="tunnel" value="building_passage" />
             <optional>
@@ -1566,5 +1499,5 @@
             </optional>
         </item>
-        <item name="Arcade" type="way">
+        <item name="Arcade" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:covered"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:covered"
@@ -1574,5 +1507,4 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:covered"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:covered" />
-            <label text="Edit Arcade" />
             <space />
             <key key="covered" value="arcade" />
@@ -1584,5 +1516,5 @@
             </optional>
         </item>
-        <item name="Colonnade" type="way">
+        <item name="Colonnade" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:covered"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:covered"
@@ -1590,5 +1522,4 @@
                   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" />
@@ -1600,5 +1531,5 @@
             </optional>
         </item>
-        <item name="Avalanche Protector" type="way">
+        <item name="Avalanche Protector" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
@@ -1610,5 +1541,4 @@
                   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" />
@@ -1625,5 +1555,5 @@
   <group name="Water" icon="presets/waterway.png">
     <group name="Water" icon="presets/waterway.png">
-        <item name="Drain" icon="presets/waterway.png" type="way">
+        <item name="Drain" icon="presets/waterway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=drain"
@@ -1632,5 +1562,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=drain"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=drain" />
-            <label text="Edit Drain" />
             <space />
             <key key="waterway" value="drain" />
@@ -1638,5 +1567,5 @@
             <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" icon="presets/waterway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=ditch"
@@ -1644,5 +1573,4 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:waterway=ditch"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=ditch" />
-            <label text="Edit Ditch" />
             <space />
             <key key="waterway" value="ditch" />
@@ -1650,5 +1578,5 @@
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
         </item>
-        <item name="Stream" icon="presets/waterway.png" type="way">
+        <item name="Stream" icon="presets/waterway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=stream"
@@ -1659,5 +1587,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=stream"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=stream" />
-            <label text="Edit Stream" />
             <space />
             <key key="waterway" value="stream" />
@@ -1665,7 +1592,6 @@
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
         </item>
-        <item name="Wadi" icon="presets/waterway.png" type="way">
+        <item name="Wadi" icon="presets/waterway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=wadi" />
-            <label text="Edit Wadi" />
             <space />
             <key key="waterway" value="wadi" />
@@ -1673,5 +1599,5 @@
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
         </item>
-        <item name="Canal" icon="presets/waterway.png" type="way">
+        <item name="Canal" icon="presets/waterway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=canal"
@@ -1680,5 +1606,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=canal"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=canal" />
-            <label text="Edit Canal" />
             <space />
             <key key="waterway" value="canal" />
@@ -1686,5 +1611,5 @@
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
         </item>
-        <item name="River" icon="presets/river.png" type="way">
+        <item name="River" icon="presets/river.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=river"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
@@ -1693,5 +1618,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=river"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=river" />
-            <label text="Edit River" />
             <space />
             <key key="waterway" value="river" />
@@ -1700,5 +1624,5 @@
         </item>
         <separator/>
-        <item name="Spring" icon="presets/spring.png" type="node,closedway">
+        <item name="Spring" icon="presets/spring.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=spring"
@@ -1707,16 +1631,14 @@
                   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>
-        <item name="Waterfall" icon="presets/waterfall.png" type="node,way">
-            <label text="Edit Waterfall" />
+        <item name="Waterfall" icon="presets/waterfall.png" type="node,way" preset_name_label="true">
             <space />
             <key key="waterway" value="waterfall" />
             <reference ref="name_wikipedia" />
         </item>
-        <item name="Weir" icon="presets/weir.png" type="node,way">
+        <item name="Weir" icon="presets/weir.png" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=weir"
@@ -1725,10 +1647,9 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=weir"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=weir" />
-            <label text="Edit Weir" />
             <space />
             <key key="waterway" value="weir" />
             <text key="name" text="Name" />
         </item>
-        <item name="Dam" icon="presets/dam.png" type="node,way,closedway">
+        <item name="Dam" icon="presets/dam.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=dam"
@@ -1738,10 +1659,9 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=dam"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=dam" />
-            <label text="Edit Dam" />
             <space />
             <key key="waterway" value="dam" />
             <reference ref="name_wikipedia" />
         </item>
-        <item name="Groyne" icon="presets/groyne.png" type="node,way,closedway">
+        <item name="Groyne" icon="presets/groyne.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=groyne"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=groyne"
@@ -1750,10 +1670,9 @@
             <key key="man_made" value="groyne" />
         </item>
-        <item name="Breakwater" icon="presets/groyne.png" type="way,closedway">
+        <item name="Breakwater" icon="presets/groyne.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=breakwater"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=breakwater"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=breakwater"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=breakwater" />
-            <label text="Edit Breakwater" />
             <space />
             <key key="man_made" value="breakwater" />
@@ -1762,5 +1681,5 @@
         </item>
         <separator/>
-        <item name="Culvert" icon="presets/tunnel.png" type="way">
+        <item name="Culvert" icon="presets/tunnel.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tunnel=culvert"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tunnel=culvert"
@@ -1769,5 +1688,4 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tunnel=culvert"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tunnel=culvert" />
-            <label text="Edit Culvert" />
             <key key="tunnel" value="culvert" />
             <optional>
@@ -1779,11 +1697,10 @@
         </item>
         <separator/>
-        <item name="Basin" icon="presets/landuse_water.png" type="node,closedway,relation">
-            <label text="Edit Basin Landuse" />
+        <item name="Basin" icon="presets/landuse_water.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="landuse" value="basin" />
             <text key="name" text="Name" />
         </item>
-        <item name="Reservoir" icon="presets/landuse_water.png" type="node,closedway,relation">
+        <item name="Reservoir" icon="presets/landuse_water.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=reservoir"
@@ -1791,11 +1708,9 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=reservoir"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=reservoir" />
-            <label text="Edit Reservoir Landuse" />
             <space />
             <key key="landuse" value="reservoir" />
             <text key="name" text="Name" />
         </item>
-        <item name="Covered Reservoir" icon="presets/reservoir_covered.png" type="node,closedway,relation">
-            <label text="Edit Covered Reservoir" />
+        <item name="Covered Reservoir" icon="presets/reservoir_covered.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="man_made" value="reservoir_covered" />
@@ -1803,5 +1718,5 @@
         </item>
         <separator/>
-        <item name="Water" icon="presets/water.png" type="node,closedway,relation">
+        <item name="Water" icon="presets/water.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=water"
@@ -1810,5 +1725,4 @@
                   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" />
@@ -1816,11 +1730,10 @@
             <combo key="water" text="Water Body" values="lake,lagoon,pond,reservoir" match="key" values_searchable="true" />
         </item>
-        <item name="Land" icon="presets/landuse.png" type="node,closedway,relation">
-            <label text="Edit Land" />
+        <item name="Land" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="natural" value="land" />
             <text key="name" text="Name" />
         </item>
-        <item name="Coastline" icon="presets/coastline.png" type="node,way,closedway,relation">
+        <item name="Coastline" icon="presets/coastline.png" type="node,way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=coastline"
@@ -1828,10 +1741,9 @@
                   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>
-        <item name="Riverbank" icon="presets/waterway.png" type="closedway,relation">
+        <item name="Riverbank" icon="presets/waterway.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank"
@@ -1841,5 +1753,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=riverbank"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:waterway=riverbank" />
-            <label text="Edit Riverbank" />
             <space />
             <key key="waterway" value="riverbank" />
@@ -1847,5 +1758,5 @@
         </item>
         <separator/>
-        <item name="Wetland" icon="presets/empty.png" type="node,closedway,relation">
+        <item name="Wetland" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wetland"
@@ -1858,5 +1769,4 @@
                   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" />
@@ -1864,11 +1774,10 @@
             <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove" values_searchable="true" />
         </item>
-        <item name="Mud" icon="presets/mud.png" type="node,closedway,relation">
-            <label text="Edit Mud" />
+        <item name="Mud" icon="presets/mud.png" type="node,closedway,relation" preset_name_label="true">
             <key key="natural" value="mud" />
             <space />
             <text key="name" text="Name" />
         </item>
-        <item name="Beach" icon="presets/beach.png" type="node,closedway,relation">
+        <item name="Beach" icon="presets/beach.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=beach"
@@ -1877,16 +1786,14 @@
                   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" />
+        <item name="Bay" icon="presets/bay.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="natural" value="bay" />
             <text key="name" text="Name" />
         </item>
-        <item name="Cliff" icon="presets/cliff.png" type="node,way,closedway,relation">
+        <item name="Cliff" icon="presets/cliff.png" type="node,way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=cliff"
@@ -1895,5 +1802,4 @@
                   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" />
@@ -1902,5 +1808,5 @@
       </group> <!-- Water -->
     <group name="Shipping" icon="presets/ferry.png">
-        <item name="Ferry Terminal" icon="presets/ferry.png" type="node,closedway">
+        <item name="Ferry Terminal" icon="presets/ferry.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=ferry_terminal"
@@ -1909,5 +1815,4 @@
                   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" />
@@ -1915,5 +1820,5 @@
             <combo key="cargo" text="Cargo" values="passengers,vehicle,bicycle,hgv,passengers;vehicle" values_context="cargo" />
         </item>
-        <item name="Ferry Route" icon="presets/ferry.png" type="way,closedway,relation">
+        <item name="Ferry Route" icon="presets/ferry.png" type="way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:route=ferry"
@@ -1921,5 +1826,4 @@
                   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" />
             <key key="route" value="ferry" />
             <optional>
@@ -1928,11 +1832,10 @@
         </item>
         <separator/>
-        <item name="Marina" icon="presets/marina.png" type="node,closedway">
-            <label text="Edit Marina" />
+        <item name="Marina" icon="presets/marina.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="leisure" value="marina" />
             <text key="name" text="Name" />
         </item>
-        <item name="Pier" icon="presets/pier.png" type="way,closedway">
+        <item name="Pier" icon="presets/pier.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pier"
@@ -1941,10 +1844,9 @@
                   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>
-        <item name="Lock Gate" icon="presets/lock_gate.png" type="node">
+        <item name="Lock Gate" icon="presets/lock_gate.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=lock_gate"
@@ -1954,5 +1856,5 @@
             <key key="waterway" value="lock_gate" />
         </item>
-        <item name="Turning Point" icon="presets/turning.png" type="node">
+        <item name="Turning Point" icon="presets/turning.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=turning_point" />
@@ -1960,5 +1862,5 @@
         </item>
         <separator/>
-        <item name="Slipway" icon="styles/standard/nautical/slipway.png" type="node">
+        <item name="Slipway" icon="styles/standard/nautical/slipway.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -1967,5 +1869,4 @@
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=slipway"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=slipway" />
-            <label text="Edit Slipway" />
             <key key="leisure" value="slipway" />
             <optional>
@@ -1973,20 +1874,18 @@
             </optional>
         </item>
-        <item name="Boatyard" icon="presets/boatyard.png" type="node,closedway">
+        <item name="Boatyard" icon="presets/boatyard.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=boatyard"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=boatyard"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=boatyard" />
-            <label text="Edit Boatyard" />
             <space />
             <key key="waterway" value="boatyard" />
             <text key="name" text="Name" />
         </item>
-        <item name="Dock" icon="presets/boatyard.png" type="node,closedway">
+        <item name="Dock" icon="presets/boatyard.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=dock"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=dock"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=dock" />
-            <label text="Edit Dock" />
             <space />
             <key key="waterway" value="dock" />
@@ -1997,5 +1896,5 @@
   <group name="Transport" icon="presets/railway.png">
     <group name="Railway" icon="presets/railway.png">
-        <item name="Rail" icon="presets/railway.png" type="way">
+        <item name="Rail" icon="presets/railway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=rail"
@@ -2006,5 +1905,4 @@
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:railway=rail"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:railway=rail" />
-            <label text="Edit Rail" />
             <key key="railway" value="rail" />
             <optional>
@@ -2013,7 +1911,6 @@
             </optional>
         </item>
-        <item name="Narrow Gauge Rail" icon="presets/railway.png" type="way">
+        <item name="Narrow Gauge Rail" icon="presets/railway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail" />
-            <label text="Edit Narrow Gauge Rail" />
             <key key="railway" value="narrow_gauge" />
             <optional>
@@ -2022,10 +1919,9 @@
             </optional>
         </item>
-        <item name="Monorail" icon="presets/railway.png" type="way">
+        <item name="Monorail" icon="presets/railway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=monorail"
                   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" />
             <key key="railway" value="monorail" />
             <optional>
@@ -2034,7 +1930,6 @@
             </optional>
         </item>
-        <item name="Preserved" icon="presets/rail_preserved.png" type="way">
+        <item name="Preserved" icon="presets/rail_preserved.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=preserved" />
-            <label text="Edit Preserved Railway" />
             <key key="railway" value="preserved" />
             <optional>
@@ -2042,7 +1937,6 @@
             </optional>
         </item>
-        <item name="Light Rail" icon="presets/rail_light.png" type="way">
+        <item name="Light Rail" icon="presets/rail_light.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail" />
-            <label text="Edit Light Rail" />
             <key key="railway" value="light_rail" />
             <optional>
@@ -2050,10 +1944,9 @@
             </optional>
         </item>
-        <item name="Subway" icon="presets/rail_light.png" type="way">
+        <item name="Subway" icon="presets/rail_light.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway"
                   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 Subway" />
             <key key="railway" value="subway" />
             <optional>
@@ -2061,5 +1954,5 @@
             </optional>
         </item>
-        <item name="Tram" icon="presets/tram.png" type="way">
+        <item name="Tram" icon="presets/tram.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram"
@@ -2068,5 +1961,4 @@
                   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" />
             <key key="railway" value="tram" />
             <optional>
@@ -2074,9 +1966,8 @@
             </optional>
         </item>
-        <item name="Bus Guideway" icon="presets/busway.png" type="way">
+        <item name="Bus Guideway" icon="presets/busway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway"
                   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" />
             <key key="highway" value="bus_guideway" />
             <optional>
@@ -2090,8 +1981,7 @@
         </item>
         <separator/>
-        <item name="Disused Rail" icon="presets/railway.png" type="way">
+        <item name="Disused Rail" icon="presets/railway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=disused"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=disused" />
-            <label text="Edit Disused Railway" />
             <key key="railway" value="disused" />
             <optional>
@@ -2099,8 +1989,7 @@
             </optional>
         </item>
-        <item name="Abandoned Rail" icon="presets/railway.png" type="way">
+        <item name="Abandoned Rail" icon="presets/railway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=abandoned"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=abandoned" />
-            <label text="Edit Abandoned Railway" />
             <key key="railway" value="abandoned" />
             <optional>
@@ -2109,5 +1998,5 @@
         </item>
         <separator/>
-        <item name="Level Crossing" icon="presets/level_crossing.png" type="node">
+        <item name="Level Crossing" icon="presets/level_crossing.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing"
                   bg.href="http://wiki.openstreetmap.org/wiki/Bg:Tag:railway=level_crossing"
@@ -2121,5 +2010,4 @@
                   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>
@@ -2130,5 +2018,5 @@
             </optional>
         </item>
-        <item name="Crossing" icon="presets/crossing.png" type="node">
+        <item name="Crossing" icon="presets/crossing.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
                   bg.href="http://wiki.openstreetmap.org/wiki/Bg:Key:crossing"
@@ -2138,5 +2026,4 @@
                   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>
@@ -2150,5 +2037,5 @@
             </optional>
         </item>
-        <item name="Turntable" icon="presets/turntable.png" type="node,closedway">
+        <item name="Turntable" icon="presets/turntable.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=turntable"
@@ -2156,10 +2043,10 @@
             <key key="railway" value="turntable" />
         </item>
-        <item name="Buffer Stop" icon="styles/standard/transport/buffer_stop.png" type="node">
+        <item name="Buffer Stop" icon="styles/standard/transport/buffer_stop.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=buffer_stop"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=buffer_stop" />
             <key key="railway" value="buffer_stop" />
         </item>
-        <item name="Railway Switch" icon="presets/railway_switch.png" type="node">
+        <item name="Railway Switch" icon="presets/railway_switch.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=switch"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=switch" />
@@ -2169,8 +2056,7 @@
     </group> <!-- Railway -->
     <group name="Aerialway" icon="presets/aerialway.png">
-        <item name="Chair Lift" icon="presets/chair_lift.png" type="way">
+        <item name="Chair Lift" icon="presets/chair_lift.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:aerialway=chair_lift" />
-            <label text="Edit Chair Lift" />
             <space />
             <key key="aerialway" value="chair_lift" />
@@ -2184,7 +2070,6 @@
             </optional>
         </item>
-        <item name="Drag Lift" icon="presets/drag_lift.png" type="way">
+        <item name="Drag Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-            <label text="Edit Drag Lift" />
             <space />
             <key key="aerialway" value="drag_lift" />
@@ -2195,5 +2080,5 @@
             </optional>
         </item>
-        <item name="Cable Car" icon="presets/cable_car.png" type="way">
+        <item name="Cable Car" icon="presets/cable_car.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aerialway=cable_car"
@@ -2202,5 +2087,4 @@
                   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" />
@@ -2213,10 +2097,9 @@
             </optional>
         </item>
-        <item name="Gondola" icon="presets/aerialway.png" type="way">
+        <item name="Gondola" icon="presets/aerialway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Proposed_features/Piste_Maps"
                   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" />
@@ -2229,7 +2112,6 @@
             </optional>
         </item>
-        <item name="Mixed Lift" type="way">
+        <item name="Mixed Lift" type="way" preset_name_label="true">
             <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" />
@@ -2243,10 +2125,9 @@
             </optional>
         </item>
-        <item name="T-bar Lift" icon="presets/drag_lift.png" type="way">
+        <item name="T-bar Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Proposed_features/Piste_Maps"
                   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 T-bar Lift" />
             <space />
             <key key="aerialway" value="t-bar" />
@@ -2257,7 +2138,6 @@
             </optional>
         </item>
-        <item name="J-bar Lift" icon="presets/drag_lift.png" type="way">
+        <item name="J-bar Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
             <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" />
@@ -2268,7 +2148,6 @@
             </optional>
         </item>
-        <item name="Platter Lift" icon="presets/drag_lift.png" type="way">
+        <item name="Platter Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-            <label text="Edit Platter Lift" />
             <space />
             <key key="aerialway" value="platter" />
@@ -2279,7 +2158,6 @@
             </optional>
         </item>
-        <item name="Rope Tow" type="way">
+        <item name="Rope Tow" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-            <label text="Edit Rope Tow" />
             <space />
             <key key="aerialway" value="rope_tow" />
@@ -2290,7 +2168,6 @@
             </optional>
         </item>
-        <item name="Magic Carpet" type="way">
+        <item name="Magic Carpet" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-            <label text="Edit Magic Carpet" />
             <space />
             <key key="aerialway" value="magic_carpet" />
@@ -2301,6 +2178,5 @@
             </optional>
         </item>
-        <item name="Goods" icon="presets/goods.png" type="way">
-            <label text="Edit Goods" />
+        <item name="Goods" icon="presets/goods.png" type="way" preset_name_label="true">
             <space />
             <key key="aerialway" value="goods" />
@@ -2311,14 +2187,12 @@
         </item>
         <separator/>
-        <item name="Station" name_context="aerialway" icon="presets/aerialway_station.png" type="node,closedway">
+        <item name="Station" name_context="aerialway" icon="presets/aerialway_station.png" type="node,closedway" preset_name_label="true">
             <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" icon="presets/power_tower.png" type="node">
+        <item name="Pylon" icon="presets/power_tower.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-            <label text="Edit Pylon" />
             <space />
             <key key="aerialway" value="pylon" />
@@ -2328,5 +2202,5 @@
     <separator/>
     <group name="Car" icon="presets/car.png">
-        <item name="Parking" icon="presets/parking.png" type="node,closedway">
+        <item name="Parking" icon="presets/parking.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking"
@@ -2339,5 +2213,4 @@
                   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" />
@@ -2355,5 +2228,5 @@
             <reference ref="supervised_lit_oh" />
         </item>
-        <item name="Parking space" icon="presets/parking.png" type="node,closedway">
+        <item name="Parking space" icon="presets/parking.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking_space"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking_space"
@@ -2362,5 +2235,4 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=parking_space"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=parking_space" />
-            <label text="Edit Parking space" />
             <space />
             <key key="amenity" value="parking_space" />
@@ -2372,5 +2244,5 @@
             <check key="covered" text="Covered (with roof)" />
         </item>
-        <item name="Parking entrance" icon="presets/parking.png" type="node">
+        <item name="Parking entrance" icon="presets/parking.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking_entrance"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking_entrance"
@@ -2378,5 +2250,4 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=parking_entrance"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=parking_entrance" />
-            <label text="Edit Parking entrance" />
             <space />
             <key key="amenity" value="parking_entrance" />
@@ -2388,5 +2259,5 @@
         </item>
         <separator/>
-        <item name="Fuel" icon="presets/fuel.png" type="node,closedway">
+        <item name="Fuel" icon="presets/fuel.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
@@ -2401,5 +2272,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fuel"
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=fuel" />
-            <label text="Edit Fuel" />
             <space />
             <key key="amenity" value="fuel" />
@@ -2431,8 +2301,7 @@
             </optional>
         </item>
-        <item name="Charging Station" icon="styles/standard/accommodation/camping/hookup.png" type="node">
+        <item name="Charging Station" icon="styles/standard/accommodation/camping/hookup.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=charging_station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=charging_station" />
-            <label text="Edit Charging Station (for electric cars)" />
             <space />
             <key key="amenity" value="charging_station" />
@@ -2441,6 +2310,5 @@
             <text key="amperage" text="Amperage" />
         </item>
-        <item name="Wash" icon="presets/car_wash.png" type="node,closedway">
-            <label text="Edit Car Wash" />
+        <item name="Wash" icon="presets/car_wash.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="amenity" value="car_wash" />
@@ -2448,5 +2316,5 @@
         </item>
         <separator/>
-        <item name="Car Dealer" icon="presets/car.png" type="node,closedway">
+        <item name="Car Dealer" icon="presets/car.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=car"
@@ -2457,5 +2325,4 @@
                   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" />
@@ -2463,6 +2330,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Repair" icon="presets/car_repair.png" type="node,closedway">
-            <label text="Edit Car Repair" />
+        <item name="Repair" icon="presets/car_repair.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="shop" value="car_repair" />
@@ -2470,9 +2336,8 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Parts" icon="presets/car_repair.png" type="node,closedway">
+        <item name="Parts" icon="presets/car_repair.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car_parts"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=car_parts"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=car_parts" />
-            <label text="Edit Car Parts" />
             <space />
             <key key="shop" value="car_parts" />
@@ -2480,6 +2345,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Tyres" icon="presets/tyres.png" type="node,closedway">
-            <label text="Edit Tyres" />
+        <item name="Tyres" icon="presets/tyres.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="shop" value="tyres" />
@@ -2488,5 +2352,5 @@
         </item>
         <separator/>
-        <item name="Rental" icon="presets/car_rental.png" type="node,closedway">
+        <item name="Rental" icon="presets/car_rental.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=car_rental"
@@ -2495,5 +2359,4 @@
                   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" />
@@ -2502,5 +2365,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Sharing" icon="presets/car_sharing.png" type="node,closedway">
+        <item name="Sharing" icon="presets/car_sharing.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=car_sharing"
@@ -2510,5 +2373,4 @@
                   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" />
@@ -2520,6 +2382,5 @@
     </group> <!-- Car -->
     <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" />
+        <item name="Parking" icon="styles/standard/vehicle/parking/motorbike.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="amenity" value="motorcycle_parking" />
@@ -2529,10 +2390,9 @@
             <combo key="fee" text="Fee" values="yes,no" />
         </item>
-        <item name="Motorcycle Dealer" icon="presets/motorbike.png" type="node,closedway">
+        <item name="Motorcycle Dealer" icon="presets/motorbike.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=motorcycle"
                   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" />
@@ -2555,5 +2415,5 @@
     </group> <!-- Motorcycle -->
     <group name="Bicycle" icon="presets/bike.png">
-        <item name="Parking" icon="styles/standard/vehicle/parking/bicycle.png" type="node,closedway">
+        <item name="Parking" icon="styles/standard/vehicle/parking/bicycle.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bicycle_parking"
@@ -2565,5 +2425,4 @@
                   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" />
@@ -2574,5 +2433,5 @@
             <check key="supervised" text="Supervised" />
         </item>
-        <item name="Bike Dealer" icon="presets/bike.png" type="node,closedway">
+        <item name="Bike Dealer" icon="presets/bike.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=bicycle"
@@ -2584,5 +2443,4 @@
                   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" />
@@ -2597,5 +2455,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Rental" icon="presets/bicycle_rental.png" type="node,closedway">
+        <item name="Rental" icon="presets/bicycle_rental.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bicycle_rental"
@@ -2609,5 +2467,4 @@
                   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" />
@@ -2617,7 +2474,6 @@
     </group> <!-- Bicycle -->
     <group name="Public Transport" icon="presets/bus.png">
-        <item name="Public transport route" icon="presets/path.png" type="relation">
+        <item name="Public transport route" icon="presets/path.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route" />
-            <label text="Edit public transport route" />
             <space />
             <key key="type" value="route" />
@@ -2644,7 +2500,6 @@
             </roles>
         </item>
-        <item name="Route master" icon="presets/path.png" type="relation">
+        <item name="Route master" icon="presets/path.png" type="relation" preset_name_label="true">
             <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" />
@@ -2660,7 +2515,6 @@
             </roles>
         </item>
-        <item name="Stop Area" type="relation" icon="presets/interpolation.png">
+        <item name="Stop Area" type="relation" icon="presets/interpolation.png" preset_name_label="true">
             <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" />
@@ -2681,7 +2535,6 @@
         </item>
         <separator/>
-        <item name="Stop Position" type="node" icon="presets/barrier.png">
+        <item name="Stop Position" type="node" icon="presets/barrier.png" preset_name_label="true">
             <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" />
@@ -2709,7 +2562,6 @@
             <check key="ferry" text="Ferry" />
         </item>
-        <item name="Platform" type="node,way,closedway" icon="presets/platform_bus.png">
+        <item name="Platform" type="node,way,closedway" icon="presets/platform_bus.png" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Platform" />
-            <label text="Edit Platform" />
             <space />
             <key key="public_transport" value="platform" />
@@ -2740,10 +2592,9 @@
             </optional>
         </item>
-        <item name="Station" name_context="railway" 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" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:public_transport=station"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:public_transport=station"
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:public_transport=station"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:public_transport=station" />
-            <label text="Edit Station" text_context="railway" />
             <space />
             <key key="public_transport" value="station" />
@@ -2755,10 +2606,9 @@
         </item>
         <separator/>
-        <item name="Subway Entrance" icon="presets/underground.png" type="node">
+        <item name="Subway Entrance" icon="presets/underground.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance"
                   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" />
             <key key="railway" value="subway_entrance" />
             <optional>
@@ -2768,5 +2618,5 @@
             </optional>
         </item>
-        <item name="Ticket Machine" icon="presets/vending_machine.png" type="node">
+        <item name="Ticket Machine" icon="presets/vending_machine.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"
@@ -2774,5 +2624,4 @@
                   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" />
             <space />
             <key key="amenity" value="vending_machine" />
@@ -2784,6 +2633,5 @@
     </group>
     <group name="Public Transport (legacy)" icon="presets/bus.png">
-        <item name="Public transport route (legacy)" icon="presets/path.png" type="relation">
-            <label text="Edit Public transport route (legacy)" />
+        <item name="Public transport route (legacy)" icon="presets/path.png" type="relation" preset_name_label="true">
             <key key="type" value="route" />
             <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" values_searchable="true" match="keyvalue" />
@@ -2809,5 +2657,5 @@
             </roles>
         </item>
-        <item name="Station" name_context="railway" icon="styles/standard/transport/railway_station.png" type="node,closedway">
+        <item name="Station" name_context="railway" icon="styles/standard/transport/railway_station.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station"
@@ -2817,5 +2665,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=station"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:railway=station" />
-            <label text="Edit Station" text_context="railway" />
             <key key="railway" value="station" />
             <optional>
@@ -2824,10 +2671,9 @@
             </optional>
         </item>
-        <item name="Railway Halt" icon="presets/station.png" type="node">
+        <item name="Railway Halt" icon="presets/station.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=halt"
                   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" />
             <key key="railway" value="halt" />
             <optional>
@@ -2835,9 +2681,8 @@
             </optional>
         </item>
-        <item name="Tram Stop" icon="presets/tram.png" type="node">
+        <item name="Tram Stop" icon="presets/tram.png" type="node" preset_name_label="true">
            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
                   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" />
             <key key="railway" value="tram_stop" />
             <optional>
@@ -2845,9 +2690,8 @@
             </optional>
         </item>
-        <item name="Railway Platform" icon="presets/platform_rail.png" type="way,closedway">
+        <item name="Railway Platform" icon="presets/platform_rail.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
                   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" />
             <space />
             <key key="railway" value="platform" />
@@ -2857,5 +2701,5 @@
         </item>
         <separator/>
-        <item name="Bus Station" icon="presets/bus.png" type="node,closedway">
+        <item name="Bus Station" icon="presets/bus.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station"
@@ -2863,5 +2707,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bus_station"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bus_station" />
-            <label text="Edit Bus Station" />
             <key key="amenity" value="bus_station" />
             <optional>
@@ -2869,5 +2712,5 @@
             </optional>
         </item>
-        <item name="Bus Stop" icon="presets/bus_small.png" type="node">
+        <item name="Bus Stop" icon="presets/bus_small.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_stop"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
@@ -2879,5 +2722,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=bus_stop"
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:highway=bus_stop" />
-            <label text="Edit Bus Stop" />
             <key key="highway" value="bus_stop" />
             <optional>
@@ -2888,6 +2730,5 @@
             </optional>
         </item>
-        <item name="Bus Platform" icon="presets/platform_bus.png" type="node,way,closedway">
-            <label text="Edit Bus Platform" />
+        <item name="Bus Platform" icon="presets/platform_bus.png" type="node,way,closedway" preset_name_label="true">
             <space />
             <key key="highway" value="platform" />
@@ -2897,5 +2738,5 @@
         </item>
     </group> <!-- Public Transport -->
-    <item name="Taxi" icon="presets/taxi.png" type="node,closedway">
+    <item name="Taxi" icon="presets/taxi.png" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=taxi"
@@ -2906,5 +2747,4 @@
                   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" />
         <space />
         <key key="amenity" value="taxi" />
@@ -2913,9 +2753,8 @@
     <separator/>
     <group name="Airport" icon="presets/plane.png">
-        <item name="Airport Ground" icon="presets/plane.png" type="node,closedway">
+        <item name="Airport Ground" icon="presets/plane.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome"
                   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" />
@@ -2928,5 +2767,5 @@
         </item>
         <separator/>
-        <item name="Runway" icon="presets/runway.png" type="way">
+        <item name="Runway" icon="presets/runway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:aeroway=runway"
@@ -2934,5 +2773,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=runway"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=runway" />
-            <label text="Edit Runway" />
             <key key="aeroway" value="runway" />
             <optional>
@@ -2940,10 +2778,9 @@
             </optional>
         </item>
-        <item name="Taxiway" icon="presets/taxiway.png" type="way">
+        <item name="Taxiway" icon="presets/taxiway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aeroway=taxiway"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=taxiway"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=taxiway" />
-            <label text="Edit Taxiway" />
             <key key="aeroway" value="taxiway" />
             <optional>
@@ -2951,5 +2788,5 @@
             </optional>
         </item>
-        <item name="Helipad" icon="styles/standard/transport/airport/helipad.png" type="node,closedway">
+        <item name="Helipad" icon="styles/standard/transport/airport/helipad.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=helipad"
@@ -2958,5 +2795,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=helipad"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=helipad" />
-            <label text="Edit Helipad" />
             <key key="aeroway" value="helipad" />
             <optional>
@@ -2964,5 +2800,5 @@
             </optional>
         </item>
-        <item name="Apron" icon="presets/apron.png" type="closedway">
+        <item name="Apron" icon="presets/apron.png" type="closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aeroway=apron"
@@ -2971,10 +2807,10 @@
             <key key="aeroway" value="apron" />
         </item>
-        <item name="Hangar" icon="presets/hangar.png" type="node,closedway">
+        <item name="Hangar" icon="presets/hangar.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:aeroway=hangar" />
             <key key="building" value="hangar" />
         </item>
-        <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node">
+        <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=beacon"
@@ -2982,5 +2818,5 @@
             <key key="man_made" value="beacon" />
         </item>
-        <item name="Windsock" icon="styles/standard/transport/airport/windsock.png" type="node">
+        <item name="Windsock" icon="styles/standard/transport/airport/windsock.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=windsock"
@@ -2989,5 +2825,5 @@
         </item>
         <separator/>
-        <item name="Terminal" icon="styles/standard/transport/airport/terminal.png" type="node,closedway">
+        <item name="Terminal" icon="styles/standard/transport/airport/terminal.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:aeroway=terminal"
@@ -2995,5 +2831,4 @@
                   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" />
@@ -3003,9 +2838,8 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Gate" name_context="airport" icon="presets/aeroway_gate.png" type="node">
+        <item name="Gate" name_context="airport" icon="presets/aeroway_gate.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate"
                   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" />
@@ -3016,5 +2850,5 @@
   <group name="Facilities" icon="presets/bed.png">
     <group name="Accommodation" icon="presets/bed.png">
-        <item name="Hotel" icon="presets/bed.png" type="node,closedway">
+        <item name="Hotel" icon="presets/bed.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=hotel"
@@ -3025,5 +2859,4 @@
                   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" />
@@ -3035,5 +2868,5 @@
             <reference ref="contact" />
         </item>
-        <item name="Motel" icon="styles/standard/accommodation/motel.png" type="node,closedway">
+        <item name="Motel" icon="styles/standard/accommodation/motel.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=motel"
@@ -3041,5 +2874,4 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl: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" />
@@ -3051,10 +2883,9 @@
             <reference ref="contact" />
         </item>
-        <item name="Guest House" icon="styles/standard/accommodation/guest_house.png" type="node,closedway">
+        <item name="Guest House" icon="styles/standard/accommodation/guest_house.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=guest_house"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=guest_house"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl: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" />
@@ -3066,5 +2897,5 @@
             <reference ref="contact" />
         </item>
-        <item name="Chalet" icon="styles/standard/accommodation/chalet.png" type="node,closedway">
+        <item name="Chalet" icon="styles/standard/accommodation/chalet.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=chalet"
@@ -3073,5 +2904,4 @@
                   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" />
@@ -3083,5 +2913,5 @@
             <reference ref="contact" />
         </item>
-        <item name="Hostel" icon="presets/hostel.png" type="node,closedway">
+        <item name="Hostel" icon="presets/hostel.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=hostel"
@@ -3091,5 +2921,4 @@
                   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" />
@@ -3101,5 +2930,5 @@
             <reference ref="contact" />
         </item>
-        <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut.png" type="node,closedway">
+        <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=alpine_hut"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=alpine_hut"
@@ -3108,5 +2937,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=alpine_hut"
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:tourism=alpine_hut" />
-            <label text="Edit Alpine Hut" />
             <space />
             <key key="tourism" value="alpine_hut" />
@@ -3119,10 +2947,9 @@
         </item>
         <separator/>
-        <item name="Caravan Site" icon="presets/caravan2.png" type="node,closedway">
+        <item name="Caravan Site" icon="presets/caravan2.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=caravan_site"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=caravan_site"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl: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" />
@@ -3139,5 +2966,5 @@
             <reference ref="contact" />
         </item>
-        <item name="Camping Site" icon="presets/tent.png" type="node,closedway">
+        <item name="Camping Site" icon="presets/tent.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=camp_site"
@@ -3148,5 +2975,4 @@
                   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" />
@@ -3160,5 +2986,5 @@
     </group> <!-- Accomodation -->
     <group name="Food+Drinks" icon="presets/restaurant.png">
-        <item name="Restaurant" icon="presets/restaurant.png" type="node,closedway">
+        <item name="Restaurant" icon="presets/restaurant.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=restaurant"
@@ -3168,5 +2994,4 @@
                   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" />
@@ -3181,5 +3006,5 @@
             <reference ref="contact" />
         </item>
-        <item name="Fast Food" icon="presets/fastfood.png" type="node,closedway">
+        <item name="Fast Food" icon="presets/fastfood.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fast_food"
@@ -3187,5 +3012,4 @@
                   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" />
@@ -3198,10 +3022,9 @@
             <reference ref="contact" />
         </item>
-        <item name="Food Court" icon="presets/fastfood.png" type="node,closedway">
+        <item name="Food Court" icon="presets/fastfood.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=food_court"
                   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" />
@@ -3212,5 +3035,5 @@
             <reference ref="contact" />
         </item>
-        <item name="Cafe" icon="presets/cafe.png" type="node,closedway">
+        <item name="Cafe" icon="presets/cafe.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=cafe"
@@ -3222,5 +3045,4 @@
                   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" />
@@ -3233,5 +3055,5 @@
             <reference ref="contact" />
         </item>
-        <item name="Pub" icon="presets/pub.png" type="node,closedway">
+        <item name="Pub" icon="presets/pub.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=pub"
@@ -3239,5 +3061,4 @@
                   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" />
@@ -3250,5 +3071,5 @@
             <reference ref="contact" />
         </item>
-        <item name="Biergarten" icon="presets/biergarten.png" type="node,closedway">
+        <item name="Biergarten" icon="presets/biergarten.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=biergarten"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=biergarten"
@@ -3256,5 +3077,4 @@
                   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" />
@@ -3267,5 +3087,5 @@
             <reference ref="contact" />
         </item>
-        <item name="Bar" icon="presets/bar.png" type="node,closedway">
+        <item name="Bar" icon="presets/bar.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bar"
@@ -3276,5 +3096,4 @@
                   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" />
@@ -3285,5 +3104,5 @@
             <reference ref="contact" />
         </item>
-        <item name="Nightclub" icon="presets/bar.png" type="node,closedway">
+        <item name="Nightclub" icon="presets/bar.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=nightclub"
@@ -3295,5 +3114,4 @@
                   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" />
@@ -3305,5 +3123,5 @@
             <reference ref="contact" />
         </item>
-        <item name="Stripclub" icon="styles/standard/leisure/stripclub.png" type="node,closedway">
+        <item name="Stripclub" icon="styles/standard/leisure/stripclub.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=stripclub"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=stripclub"
@@ -3311,5 +3129,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=stripclub"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=stripclub" />
-            <label text="Edit Stripclub" />
             <space />
             <key key="amenity" value="stripclub" />
@@ -3322,11 +3139,10 @@
     </group> <!-- Food+Drinks -->
     <group name="Tourism" icon="presets/sightseeing.png">
-        <item name="Attraction" icon="presets/sightseeing.png" type="node,closedway">
-            <label text="Edit Attraction" />
+        <item name="Attraction" icon="presets/sightseeing.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="tourism" value="attraction" />
             <reference ref="name_oh" />
         </item>
-        <item name="Viewpoint" icon="presets/viewpoint.png" type="node,closedway">
+        <item name="Viewpoint" icon="presets/viewpoint.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=viewpoint"
@@ -3336,5 +3152,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=viewpoint"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=viewpoint" />
-            <label text="Edit Viewpoint" />
             <space />
             <key key="tourism" value="viewpoint" />
@@ -3343,5 +3158,5 @@
         </item>
         <separator/>
-        <item name="Information Office" icon="presets/informationoffice.png" type="node,closedway">
+        <item name="Information Office" icon="presets/informationoffice.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:information"
@@ -3350,5 +3165,4 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:information"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:information" />
-            <label text="Edit Information Office" />
             <space />
             <key key="tourism" value="information" />
@@ -3359,7 +3173,6 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Map" icon="presets/map.png" type="node">
+        <item name="Map" icon="presets/map.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
-            <label text="Edit Information Map" />
             <space />
             <key key="tourism" value="information" />
@@ -3379,9 +3192,8 @@
             </optional>
         </item>
-        <item name="Information Board" icon="presets/board.png" type="node">
+        <item name="Information Board" icon="presets/board.png" type="node" preset_name_label="true">
             <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" />
@@ -3391,10 +3203,9 @@
             <text key="description" text="Closer Description" />
         </item>
-        <item name="Guidepost" icon="presets/guidepost.png" type="node">
+        <item name="Guidepost" icon="presets/guidepost.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:information=guidepost"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:information=guidepost"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:information=guidepost"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:information=guidepost" />
-            <label text="Edit Guidepost" />
             <space />
             <key key="tourism" value="information" />
@@ -3412,7 +3223,6 @@
             </optional>
         </item>
-        <item name="Information Terminal" icon="presets/information.png" type="node">
+        <item name="Information Terminal" icon="presets/information.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
-            <label text="Edit Information Terminal" />
             <space />
             <key key="tourism" value="information" />
@@ -3426,7 +3236,6 @@
             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
         </item>
-        <item name="Audioguide" icon="presets/information.png" type="node">
+        <item name="Audioguide" icon="presets/information.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
-            <label text="Edit Audioguide" />
             <space />
             <key key="tourism" value="information" />
@@ -3441,5 +3250,5 @@
             <text key="phone" text="Phone number" />
         </item>
-        <item name="Other Information Point" icon="presets/information.png" type="node,closedway">
+        <item name="Other Information Point" icon="presets/information.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=information"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=information"
@@ -3449,5 +3258,4 @@
                   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" />
@@ -3457,5 +3265,5 @@
     </group> <!-- Tourism -->
     <group name="Leisure" icon="presets/theme_park.png">
-        <item name="Cinema" icon="presets/cinema.png" type="node,closedway,relation">
+        <item name="Cinema" icon="presets/cinema.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=cinema"
@@ -3465,5 +3273,4 @@
                   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" />
@@ -3471,5 +3278,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Zoo" icon="presets/zoo.png" type="node,closedway">
+        <item name="Zoo" icon="presets/zoo.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=zoo"
@@ -3477,5 +3284,4 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl: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" />
@@ -3485,5 +3291,5 @@
             <reference ref="contact" />
         </item>
-        <item name="Dog Park" icon="presets/dogpark.png" type="node,closedway">
+        <item name="Dog Park" icon="presets/dogpark.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=dog_park"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:leisure=dog_park"
@@ -3495,5 +3301,4 @@
                   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" />
@@ -3504,10 +3309,9 @@
             <check key="lit" text="Lit" />
         </item>
-        <item name="Theme Park" icon="presets/theme_park.png" type="node,closedway">
+        <item name="Theme Park" icon="presets/theme_park.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=theme_park"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=theme_park"
                   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" />
@@ -3516,5 +3320,5 @@
             <reference ref="contact" />
         </item>
-        <item name="Water Park" icon="presets/swimming.png" type="node,closedway">
+        <item name="Water Park" icon="presets/swimming.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=water_park"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=water_park"
@@ -3524,5 +3328,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=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" />
@@ -3531,10 +3334,9 @@
             <reference ref="contact" />
         </item>
-        <item name="Sauna" de.name="Sauna" icon="presets/sauna.png" type="node,closedway">
+        <item name="Sauna" de.name="Sauna" icon="presets/sauna.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=sauna"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=sauna"
                   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" />
@@ -3546,7 +3348,6 @@
             <reference ref="contact" />
         </item>
-        <item name="Horse riding" icon="presets/equestrian.png" type="node,closedway">
+        <item name="Horse riding" icon="presets/equestrian.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=horse_riding" />
-            <label text="Edit Horse riding" />
             <space />
             <key key="leisure" value="horse_riding" />
@@ -3556,5 +3357,5 @@
             <reference ref="contact" />
         </item>
-        <item name="Brothel" de.name="Bordell" icon="styles/standard/leisure/stripclub.png" type="node,closedway">
+        <item name="Brothel" de.name="Bordell" icon="styles/standard/leisure/stripclub.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=brothel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=brothel"
@@ -3564,5 +3365,4 @@
                   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" />
@@ -3575,5 +3375,5 @@
         </item>
         <separator/>
-        <item name="Playground" icon="styles/standard/leisure/playground.png" type="node,closedway">
+        <item name="Playground" icon="styles/standard/leisure/playground.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=playground"
@@ -3585,11 +3385,9 @@
                   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" />
+        <item name="Picnic Site" icon="presets/picnic.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="tourism" value="picnic_site" />
@@ -3597,5 +3395,5 @@
             <check key="fireplace" text="Fireplace" />
         </item>
-        <item name="Public Grill" icon="presets/bbq.png" type="node">
+        <item name="Public Grill" icon="presets/bbq.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bbq"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bbq"
@@ -3603,5 +3401,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bbq"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bbq" />
-            <label text="Edit Public Grill" />
             <space />
             <key key="amenity" value="bbq" />
@@ -3610,15 +3407,14 @@
             <check key="covered" text="Covered" />
         </item>
-        <item name="Fishing" icon="presets/fishing.png" type="node,closedway">
+        <item name="Fishing" icon="presets/fishing.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=fishing"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:leisure=fishing"
                   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>
-        <item name="Private Swimming Pool" icon="presets/swimming.png" type="node,closedway">
+        <item name="Private Swimming Pool" icon="presets/swimming.png" type="node,closedway" preset_name_label="true">
             <key key="leisure" value="swimming_pool" />
             <key key="access" value="private" />
@@ -3626,5 +3422,5 @@
     </group> <!-- Leisure -->
     <group name="Culture" icon="presets/theater.png">
-        <item name="Museum" icon="presets/State_Public.png" type="node,closedway">
+        <item name="Museum" icon="presets/State_Public.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=museum"
@@ -3633,5 +3429,4 @@
                   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" />
@@ -3640,5 +3435,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Theatre" icon="presets/theater.png" type="node,closedway,relation">
+        <item name="Theatre" icon="presets/theater.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=theatre"
@@ -3647,5 +3442,4 @@
                   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" />
@@ -3653,5 +3447,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Library" icon="styles/standard/shop/rental/library.png" type="node,closedway,relation">
+        <item name="Library" icon="styles/standard/shop/rental/library.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=library"
@@ -3662,5 +3456,4 @@
                   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" />
@@ -3668,5 +3461,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,relation">
+        <item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=arts_centre"
@@ -3674,5 +3467,4 @@
                   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" />
@@ -3680,5 +3472,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway">
+        <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=artwork"
@@ -3689,5 +3481,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=artwork"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=artwork" />
-            <label text="Edit Artwork" />
             <space />
             <key key="tourism" value="artwork" />
@@ -3696,10 +3487,9 @@
             <text key="artist_name" text="Artist Name" />
         </item>
-        <item name="Recording Studio" icon="presets/studio.png" type="node,closedway,relation">
+        <item name="Recording Studio" icon="presets/studio.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=studio"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=studio"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=studio"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=studio" />
-            <label text="Edit Studio" />
             <space />
             <key key="amenity" value="studio" />
@@ -3710,5 +3500,5 @@
     </group> <!-- Culture -->
     <group name="Place of Worship" icon="styles/standard/religion.png">
-        <item name="Church" icon="styles/standard/religion/church.png" type="node,closedway,relation">
+        <item name="Church" icon="styles/standard/religion/church.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -3724,5 +3514,4 @@
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
-            <label text="Edit Church" />
             <space />
             <key key="amenity" value="place_of_worship" />
@@ -3734,5 +3523,5 @@
             <reference ref="oh" />
         </item>
-        <item name="Mosque" icon="styles/standard/religion/muslim.png" type="node,closedway,relation">
+        <item name="Mosque" icon="styles/standard/religion/muslim.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -3748,5 +3537,4 @@
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
-            <label text="Edit Mosque" />
             <space />
             <key key="amenity" value="place_of_worship" />
@@ -3758,5 +3546,5 @@
             <reference ref="oh" />
         </item>
-        <item name="Synagogue" icon="styles/standard/religion/jewish.png" type="node,closedway,relation">
+        <item name="Synagogue" icon="styles/standard/religion/jewish.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -3772,5 +3560,4 @@
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
-            <label text="Edit Synagogue" />
             <space />
             <key key="amenity" value="place_of_worship" />
@@ -3782,5 +3569,5 @@
             <reference ref="oh" />
         </item>
-        <item name="Buddhist Temple" icon="styles/standard/religion/buddhism.png" type="node,closedway,relation">
+        <item name="Buddhist Temple" icon="styles/standard/religion/buddhism.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -3796,5 +3583,4 @@
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
-            <label text="Edit Buddhist Temple" />
             <space />
             <key key="amenity" value="place_of_worship" />
@@ -3805,5 +3591,5 @@
             <reference ref="oh" />
         </item>
-        <item name="Hindu Temple" icon="styles/standard/religion/hinduism.png" type="node,closedway,relation">
+        <item name="Hindu Temple" icon="styles/standard/religion/hinduism.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -3819,5 +3605,4 @@
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
-            <label text="Edit Hindu Temple" />
             <space />
             <key key="amenity" value="place_of_worship" />
@@ -3828,5 +3613,5 @@
             <reference ref="oh" />
         </item>
-        <item name="Shinto Shrine" icon="styles/standard/religion/shinto.png" type="node,closedway,relation">
+        <item name="Shinto Shrine" icon="styles/standard/religion/shinto.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -3842,5 +3627,4 @@
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
-            <label text="Edit Shinto Shrine" />
             <space />
             <key key="amenity" value="place_of_worship" />
@@ -3850,5 +3634,5 @@
             <reference ref="oh" />
         </item>
-        <item name="Other Place of Worship" type="node,closedway,relation">
+        <item name="Other Place of Worship" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -3864,5 +3648,4 @@
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
-            <label text="Edit other Place of Worship" />
             <space />
             <key key="amenity" value="place_of_worship" />
@@ -3874,15 +3657,14 @@
     </group> <!-- Place of Worship -->
     <group name="Public Building" icon="presets/townhall.png">
-        <item name="Public Building" icon="styles/standard/service.png" type="node,closedway,relation">
+        <item name="Public Building" icon="styles/standard/service.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=public_building"
                   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>
-        <item name="Town hall" icon="presets/townhall.png" type="node,closedway,relation">
+        <item name="Town hall" icon="presets/townhall.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=townhall"
@@ -3892,5 +3674,4 @@
                   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" />
@@ -3898,5 +3679,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Community Centre" icon="presets/community_centre.png" type="node,closedway">
+        <item name="Community Centre" icon="presets/community_centre.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=community_centre"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=community_centre"
@@ -3911,5 +3692,5 @@
             <reference ref="oh" />
         </item>
-        <item name="Embassy" icon="presets/embassy.png" type="node,closedway,relation">
+        <item name="Embassy" icon="presets/embassy.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=embassy"
@@ -3918,5 +3699,4 @@
                   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" />
@@ -3924,5 +3704,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Courthouse" icon="presets/JusticeScales.png" type="node,closedway,relation">
+        <item name="Courthouse" icon="presets/JusticeScales.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=courthouse"
@@ -3931,5 +3711,4 @@
                   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" />
@@ -3937,5 +3716,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Prison" icon="presets/prison.png" type="node,closedway,relation">
+        <item name="Prison" icon="presets/prison.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=prison"
@@ -3944,5 +3723,4 @@
                   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" />
@@ -3950,5 +3728,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Police" icon="styles/standard/service/police.png" type="node,closedway,relation">
+        <item name="Police" icon="styles/standard/service/police.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=police"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=police"
@@ -3959,5 +3737,4 @@
                   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" />
@@ -3965,5 +3742,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Fire Station" icon="presets/firebrigade.png" type="node,closedway,relation">
+        <item name="Fire Station" icon="presets/firebrigade.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fire_station"
@@ -3974,10 +3751,9 @@
                   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>
-        <item name="Post Office" icon="styles/standard/service/post_office.png" type="node,closedway,relation">
+        <item name="Post Office" icon="styles/standard/service/post_office.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=post_office"
@@ -3989,5 +3765,4 @@
                   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" />
@@ -3996,6 +3771,5 @@
     </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" />
+        <item name="Kindergarten" icon="presets/kindergarten.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="amenity" value="kindergarten" />
@@ -4003,5 +3777,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="School" icon="presets/school.png" type="node,closedway,relation">
+        <item name="School" icon="presets/school.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school"
                   ar.href="http://wiki.openstreetmap.org/wiki/Ar:Tag:amenity=school"
@@ -4014,5 +3788,4 @@
                   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" />
@@ -4020,5 +3793,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="University" icon="styles/standard/education/university.png" type="node,closedway,relation">
+        <item name="University" icon="styles/standard/education/university.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=university"
@@ -4030,5 +3803,4 @@
                   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" />
@@ -4036,5 +3808,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="College" icon="styles/standard/education/college.png" type="node,closedway,relation">
+        <item name="College" icon="styles/standard/education/college.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=college"
@@ -4043,5 +3815,4 @@
                   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" />
@@ -4049,7 +3820,6 @@
             <reference ref="link_contact" />
         </item>
-         <item name="Driving School" icon="styles/standard/education/driving_school.png" type="node,closedway">
+         <item name="Driving School" icon="styles/standard/education/driving_school.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/driving_school" />
-            <label text="Edit Driving School" />
             <space />
             <key key="amenity" value="driving_school" />
@@ -4060,5 +3830,5 @@
     </group> <!-- Education -->
     <group name="Health" icon="presets/pharmacy.png">
-        <item name="Hospital" icon="styles/standard/health/hospital.png" type="node,closedway">
+        <item name="Hospital" icon="styles/standard/health/hospital.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=hospital"
@@ -4069,5 +3839,4 @@
                   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" />
@@ -4075,8 +3844,7 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Clinic" icon="styles/standard/health/hospital.png" type="node,closedway">
+        <item name="Clinic" icon="styles/standard/health/hospital.png" type="node,closedway" preset_name_label="true">
             <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" />
@@ -4084,5 +3852,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Doctors" icon="styles/standard/health/doctor.png" type="node,closedway">
+        <item name="Doctors" icon="styles/standard/health/doctor.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=doctors"
@@ -4090,5 +3858,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=doctors"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=doctors" />
-            <label text="Edit Doctors" />
             <space />
             <key key="amenity" value="doctors" />
@@ -4096,6 +3863,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway">
-            <label text="Edit Dentist" />
+        <item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="amenity" value="dentist" />
@@ -4103,6 +3869,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Nursing Home" type="node,closedway">
-            <label text="Edit Nursing Home" />
+        <item name="Nursing Home" type="node,closedway" preset_name_label="true">
             <space />
             <key key="amenity" value="nursing_home" />
@@ -4110,5 +3875,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Retirement Home" type="node,closedway">
+        <item name="Retirement Home" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:social_facility"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:social_facility"
@@ -4116,5 +3881,4 @@
                   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" />
@@ -4126,5 +3890,5 @@
         </item>
         <separator/>
-        <item name="Pharmacy" icon="presets/pharmacy.png" type="node,closedway">
+        <item name="Pharmacy" icon="presets/pharmacy.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=pharmacy"
@@ -4135,5 +3899,4 @@
                   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" />
@@ -4143,9 +3906,8 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway">
+        <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hearing_aids"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hearing_aids"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=hearing_aids" />
-            <label text="Edit Hearing Aids" />
             <space />
             <key key="shop" value="hearing_aids" />
@@ -4154,5 +3916,5 @@
         </item>
         <separator/>
-        <item name="Baby Hatch" icon="presets/baby_hatch.png" type="node,closedway">
+        <item name="Baby Hatch" icon="presets/baby_hatch.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=baby_hatch"
@@ -4165,5 +3927,4 @@
                   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" />
@@ -4172,5 +3933,5 @@
         </item>
         <separator/>
-        <item name="Emergency Access Point" icon="styles/standard/service/emergency_access_point.png" type="node,closedway">
+        <item name="Emergency Access Point" icon="styles/standard/service/emergency_access_point.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point"
@@ -4178,5 +3939,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=emergency_access_point"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=emergency_access_point" />
-            <label text="Edit Emergency Access Point" />
             <space />
             <key key="highway" value="emergency_access_point" />
@@ -4189,5 +3949,5 @@
         </item>
         <separator/>
-        <item name="Veterinary" icon="styles/standard/health/veterinary.png" type="node,closedway">
+        <item name="Veterinary" icon="styles/standard/health/veterinary.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=veterinary"
@@ -4199,5 +3959,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=veterinary"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=veterinary" />
-            <label text="Edit Veterinary" />
             <space />
             <key key="amenity" value="veterinary" />
@@ -4207,5 +3966,5 @@
     </group> <!-- Health -->
     <group name="Facilities" icon="presets/telephone.png">
-        <item name="Toilets" icon="presets/toilet.png" type="node,closedway">
+        <item name="Toilets" icon="presets/toilet.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=toilets"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=toilets"
@@ -4216,5 +3975,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=toilets"
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=toilets" />
-            <label text="Edit Toilets" />
             <space />
             <key key="amenity" value="toilets" />
@@ -4230,5 +3988,5 @@
             </optional>
         </item>
-        <item name="Post Box" icon="styles/standard/service/post_box.png" type="node">
+        <item name="Post Box" icon="styles/standard/service/post_box.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=post_box"
@@ -4237,5 +3995,4 @@
                   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" />
@@ -4245,5 +4002,5 @@
             <check key="drive_through" text="Drive through" />
         </item>
-        <item name="Telephone" icon="presets/telephone.png" type="node">
+        <item name="Telephone" icon="presets/telephone.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=telephone"
@@ -4253,5 +4010,4 @@
                   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" />
@@ -4260,5 +4016,5 @@
             <check key="payment:telephone_cards" text="Telephone cards" />
         </item>
-        <item name="Emergency Phone" icon="presets/telephone.png" type="node">
+        <item name="Emergency Phone" icon="presets/telephone.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=phone"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=phone"
@@ -4267,5 +4023,5 @@
             <key key="emergency" value="phone" />
         </item>
-        <item name="Internet Access" icon="presets/network-wireless.svg" type="node,closedway,relation">
+        <item name="Internet Access" icon="presets/network-wireless.svg" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:internet_access"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:internet_access"
@@ -4274,10 +4030,9 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:internet_access"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:internet_access" />
-            <label text="Edit Internet Access" />
             <space />
             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" match="key" />
             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" match="key" />
         </item>
-        <item name="Automated Defibrillator" icon="presets/aed.svg" type="node">
+        <item name="Automated Defibrillator" icon="presets/aed.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=defibrillator"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=defibrillator"
@@ -4285,5 +4040,4 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:emergency=defibrillator"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:emergency=defibrillator" />
-            <label text="Edit Automated External Defibrillator" />
             <space />
             <key key="emergency" value="defibrillator" />
@@ -4298,5 +4052,5 @@
             -->
         </item>
-        <item name="Clock" icon="styles/standard/service/clock.png" type="node">
+        <item name="Clock" icon="styles/standard/service/clock.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clock"
@@ -4304,5 +4058,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=clock"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=clock" />
-            <label text="Edit Clock" />
             <key key="amenity" value="clock" />
             <optional>
@@ -4316,5 +4069,5 @@
             </optional>
         </item>
-        <item name="Recycling" icon="presets/recycling.png" type="node,closedway">
+        <item name="Recycling" icon="presets/recycling.png" type="node,closedway" preset_name_label="true">
            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=recycling"
@@ -4328,5 +4081,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=recycling"
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=recycling" />
-            <label text="Edit Recycling Station" />
             <space />
             <key key="amenity" value="recycling" />
@@ -4339,5 +4091,5 @@
             <combo key="recycling_type" text="Type" values="container,centre" />
         </item>
-        <item name="Waste Basket" icon="styles/standard/service/recycling/trash-bin.png" type="node">
+        <item name="Waste Basket" icon="styles/standard/service/recycling/trash-bin.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_basket"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=waste_basket"
@@ -4350,5 +4102,5 @@
             <key key="amenity" value="waste_basket" />
         </item>
-        <item name="Waste Disposal" icon="styles/standard/service/recycling/waste_disposal.png" type="node">
+        <item name="Waste Disposal" icon="styles/standard/service/recycling/waste_disposal.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_disposal"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=waste_disposal"
@@ -4360,5 +4112,5 @@
         </item>
         <separator/>
-        <item name="Bench" icon="presets/bench.png" type="node">
+        <item name="Bench" icon="presets/bench.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bench"
@@ -4372,5 +4124,4 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=bench"
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=bench" />
-            <label text="Edit Bench" />
             <space />
             <key key="amenity" value="bench" />
@@ -4380,6 +4131,5 @@
             <combo key="seats" text="Amount of Seats" values="2,3,4,5,6,7,8,9,10" />
         </item>
-        <item name="Shelter" icon="presets/shelter.png" type="node,closedway">
-            <label text="Edit Shelter" />
+        <item name="Shelter" icon="presets/shelter.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="amenity" value="shelter" />
@@ -4388,6 +4138,5 @@
             <combo key="shelter_type" text="Type of shelter" values="weather_shelter,public_transport,picnic_shelter,wildlife_hide" values_context="shelter" values_searchable="true" />
         </item>
-        <item name="Hunting Stand" icon="presets/hunting_stand.png" type="node">
-            <label text="Edit Hunting Stand" />
+        <item name="Hunting Stand" icon="presets/hunting_stand.png" type="node" preset_name_label="true">
             <space />
             <key key="amenity" value="hunting_stand" />
@@ -4398,5 +4147,5 @@
         </item>
         <separator/>
-        <item name="Drinking Water" icon="presets/drinking_water.png" type="node">
+        <item name="Drinking Water" icon="presets/drinking_water.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water"
@@ -4407,5 +4156,4 @@
                   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" />
@@ -4416,5 +4164,5 @@
             </optional>
         </item>
-        <item name="Fire Hydrant" icon="presets/fire_hydrant.png" type="node">
+        <item name="Fire Hydrant" icon="presets/fire_hydrant.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=fire_hydrant"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=fire_hydrant"
@@ -4424,5 +4172,4 @@
                   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" />
@@ -4441,6 +4188,5 @@
   <group name="Sports" icon="presets/soccer.png">
     <group name="Sport Facilities" icon="presets/stadium.png">
-        <item name="Stadium" icon="presets/stadium.png" type="node,closedway">
-            <label text="Edit Stadium" />
+        <item name="Stadium" icon="presets/stadium.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="leisure" value="stadium" />
@@ -4450,6 +4196,5 @@
             </optional>
         </item>
-        <item name="Sports Centre" icon="presets/sports_centre.png" type="node,closedway">
-            <label text="Edit Sports Centre" />
+        <item name="Sports Centre" icon="presets/sports_centre.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="leisure" value="sports_centre" />
@@ -4459,6 +4204,5 @@
             </optional>
         </item>
-        <item name="Pitch" icon="presets/pitch.png" type="node,closedway">
-            <label text="Edit Pitch" />
+        <item name="Pitch" icon="presets/pitch.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="leisure" value="pitch" />
@@ -4468,6 +4212,5 @@
             </optional>
         </item>
-        <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway,relation">
-            <label text="Edit Racetrack" />
+        <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway,relation" preset_name_label="true">
             <space />
             <key key="leisure" value="track" />
@@ -4477,12 +4220,10 @@
             </optional>
         </item>
-        <item name="Golf Course" icon="presets/golf.png" type="node,closedway">
-            <label text="Edit Golf Course" />
+        <item name="Golf Course" icon="presets/golf.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="leisure" value="golf_course" />
             <reference ref="name_oh" />
         </item>
-        <item name="Miniature Golf" icon="presets/golf.png" type="node,closedway">
-            <label text="Edit Miniature Golf" />
+        <item name="Miniature Golf" icon="presets/golf.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="leisure" value="miniature_golf" />
@@ -4491,7 +4232,6 @@
     </group> <!-- Sport facilities -->
     <group name="Sport" icon="presets/rowing.png">
-        <item name="Multi" icon="styles/standard/sport/multi.png" type="node,closedway">
+        <item name="Multi" icon="styles/standard/sport/multi.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=multi" />
-            <label text="Edit Multi" />
             <space />
             <key key="sport" value="multi" />
@@ -4499,8 +4239,7 @@
             <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">
+        <item name="9pin" icon="styles/standard/sport/10pin.png" type="node,closedway" preset_name_label="true">
             <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" />
@@ -4508,7 +4247,6 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item>
-        <item name="10pin" icon="styles/standard/sport/10pin.png" type="node,closedway">
+        <item name="10pin" icon="styles/standard/sport/10pin.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=10pin" />
-            <label text="Edit 10pin" />
             <space />
             <key key="sport" value="10pin" />
@@ -4516,8 +4254,7 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item>
-        <item name="Archery" icon="styles/standard/sport/archery.png" type="node,closedway">
+        <item name="Archery" icon="styles/standard/sport/archery.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=archery"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:sport=archery" />
-            <label text="Edit Archery" />
             <space />
             <key key="sport" value="archery" />
@@ -4525,7 +4262,6 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item>
-        <item name="Athletics" icon="presets/athletics.png" type="node,closedway">
+        <item name="Athletics" icon="presets/athletics.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sports=athletics" />
-            <label text="Edit Athletics" />
             <space />
             <key key="sport" value="athletics" />
@@ -4533,8 +4269,7 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" default="track" />
         </item>
-        <item name="Climbing" icon="styles/standard/sport/climbing.png" type="node,way,closedway">
+        <item name="Climbing" icon="styles/standard/sport/climbing.png" type="node,way,closedway" preset_name_label="true">
             <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" />
@@ -4542,14 +4277,12 @@
             <combo key="leisure" text="Type" values="sports_centre" />
         </item>
-        <item name="Canoeing" icon="presets/canoe.png" type="node,way,closedway">
+        <item name="Canoeing" icon="presets/canoe.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canoe" />
-            <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">
+        <item name="Cycling" icon="presets/cycling.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cycling" />
-            <label text="Edit Cycling" />
             <space />
             <key key="sport" value="cycling" />
@@ -4557,7 +4290,6 @@
             <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">
+        <item name="Dog Racing" icon="styles/standard/leisure/dog.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=dog_racing" />
-            <label text="Edit Dog Racing" />
             <space />
             <key key="sport" value="dog_racing" />
@@ -4565,7 +4297,6 @@
             <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">
+        <item name="Equestrian" icon="presets/equestrian.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=equestrian" />
-            <label text="Edit Equestrian" />
             <space />
             <key key="sport" value="equestrian" />
@@ -4574,7 +4305,6 @@
             <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">
+        <item name="Horse Racing" icon="presets/equestrian.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=horse_racing" />
-            <label text="Edit Horse Racing" />
             <space />
             <key key="sport" value="horse_racing" />
@@ -4583,7 +4313,6 @@
             <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">
+        <item name="Gymnastics" icon="presets/gymnastics.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gymnastics" />
-            <label text="Edit Gymnastics" />
             <space />
             <key key="sport" value="gymnastics" />
@@ -4591,8 +4320,7 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item>
-        <item name="Skating" icon="presets/skating.png" type="node,closedway">
+        <item name="Skating" icon="presets/skating.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skating"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=skating" />
-            <label text="Edit Skating" />
             <space />
             <key key="sport" value="skating" />
@@ -4600,8 +4328,7 @@
             <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">
+        <item name="Skateboard" icon="styles/standard/sport/skateboard.png" type="node,closedway" preset_name_label="true">
             <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" />
@@ -4609,8 +4336,7 @@
             <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">
+        <item name="Swimming" icon="presets/swimming.png" type="node,closedway" preset_name_label="true">
             <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" />
@@ -4618,7 +4344,6 @@
             <combo key="leisure" text="Type" values="sports_centre,stadium,swimming_pool,water_park" default="swimming_pool" values_searchable="true" />
         </item>
-        <item name="Skiing" icon="presets/skiing_downhill.png" type="node,way,closedway">
+        <item name="Skiing" icon="presets/skiing_downhill.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-            <label text="Edit Skiing" />
             <space />
             <key key="sport" value="skiing" />
@@ -4628,5 +4353,5 @@
             <combo key="piste:grooming" text="Grooming" values="classic,mogul,skating,classic;skating,scooter,backcountry" values_context="piste:grooming" />
         </item>
-        <item name="Shooting" icon="presets/range.png" type="node,closedway">
+        <item name="Shooting" icon="presets/range.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=shooting"
@@ -4634,5 +4359,4 @@
                   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" />
@@ -4642,38 +4366,33 @@
     </group> <!-- Sport -->
     <group name="Sport (Ball)" icon="presets/soccer.png">
-        <item name="Soccer" icon="presets/soccer.png" type="node,closedway">
+        <item name="Soccer" icon="presets/soccer.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=soccer"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=soccer"
                   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" />
             <reference ref="name_leisure_pitch" />
         </item>
-        <item name="Australian Football" icon="presets/soccer.png" type="node,closedway">
+        <item name="Australian Football" icon="presets/soccer.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=australian_football" />
-            <label text="Edit Australian Football" />
             <space />
             <key key="sport" value="australian_football" />
             <reference ref="name_leisure_pitch" />
         </item>
-        <item name="American Football" icon="presets/football.png" type="node,closedway">
+        <item name="American Football" icon="presets/football.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=american_football" />
-            <label text="Edit American Football" />
             <space />
             <key key="sport" value="american_football" />
             <reference ref="name_leisure_pitch" />
         </item>
-        <item name="Canadian Football" icon="presets/football.png" type="node,closedway">
+        <item name="Canadian Football" icon="presets/football.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canadian_football" />
-            <label text="Edit Canadian Football" />
             <space />
             <key key="sport" value="canadian_football" />
             <reference ref="name_leisure_pitch" />
         </item>
-        <item name="Gaelic Games" icon="presets/soccer.png" type="node,closedway">
+        <item name="Gaelic Games" icon="presets/soccer.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_games" />
-            <label text="Edit Gaelic Games" />
             <space />
             <key key="sport" value="gaelic_games" />
@@ -4686,37 +4405,32 @@
             </optional>
         </item>
-        <item name="Rugby League" icon="presets/football.png" type="node,closedway">
+        <item name="Rugby League" icon="presets/football.png" type="node,closedway" preset_name_label="true">
             <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" />
             <reference ref="name_leisure_pitch" />
         </item>
-        <item name="Rugby Union" icon="presets/football.png" type="node,closedway">
+        <item name="Rugby Union" icon="presets/football.png" type="node,closedway" preset_name_label="true">
             <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" />
             <reference ref="name_leisure_pitch" />
         </item>
-        <item name="Baseball" icon="presets/baseball.png" type="node,closedway">
+        <item name="Baseball" icon="presets/baseball.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=baseball" />
-            <label text="Edit Baseball" />
             <space />
             <key key="sport" value="baseball" />
             <reference ref="name_leisure_pitch" />
         </item>
-        <item name="Basketball" icon="presets/basketball.png" type="node,closedway">
+        <item name="Basketball" icon="presets/basketball.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=basketball" />
-            <label text="Edit Basketball" />
             <space />
             <key key="sport" value="basketball" />
             <reference ref="name_leisure_pitch" />
         </item>
-        <item name="Volleyball" icon="styles/standard/sport/volleyball.png" type="node,closedway">
+        <item name="Volleyball" icon="styles/standard/sport/volleyball.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=volleyball" />
-            <label text="Edit Volleyball" />
             <space />
             <key key="sport" value="volleyball" />
@@ -4724,7 +4438,6 @@
             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
         </item>
-        <item name="Beachvolleyball" icon="presets/beachvolleyball.png" type="node,closedway">
+        <item name="Beachvolleyball" icon="presets/beachvolleyball.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=beachvolleyball" />
-            <label text="Edit Beachvolleyball" />
             <space />
             <key key="sport" value="beachvolleyball" />
@@ -4732,10 +4445,9 @@
             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
         </item>
-        <item name="Golf" icon="presets/golf.png" type="node,closedway">
+        <item name="Golf" icon="presets/golf.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=golf"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=golf"
                   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" />
@@ -4743,28 +4455,24 @@
             <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">
+        <item name="Boule" icon="presets/boule.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=boules" />
-            <label text="Edit Boule" />
             <space />
             <key key="sport" value="boules" />
             <reference ref="name_leisure_pitch" />
         </item>
-        <item name="Bowls" icon="presets/boule.png" type="node,closedway">
+        <item name="Bowls" icon="presets/boule.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=bowls" />
-            <label text="Edit Bowls" />
             <space />
             <key key="sport" value="bowls" />
             <reference ref="name_leisure_pitch" />
         </item>
-        <item name="Cricket" icon="presets/cricket.png" type="node,closedway">
+        <item name="Cricket" icon="presets/cricket.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket" />
-            <label text="Edit Cricket" />
             <space />
             <key key="sport" value="cricket" />
             <reference ref="name_leisure_pitch" />
         </item>
-        <item name="Cricket Nets" icon="presets/cricket.png" type="node,closedway">
+        <item name="Cricket Nets" icon="presets/cricket.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket_nets" />
-            <label text="Edit Cricket Nets" />
             <space />
             <key key="sport" value="cricket_nets" />
@@ -4772,14 +4480,12 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item>
-        <item name="Croquet" icon="styles/standard/sport/croquet.png" type="node,closedway">
+        <item name="Croquet" icon="styles/standard/sport/croquet.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=croquet" />
-            <label text="Edit Croquet" />
             <space />
             <key key="sport" value="croquet" />
             <reference ref="name_leisure_pitch" />
         </item>
-        <item name="Hockey" icon="presets/Hockey.png" type="node,closedway">
+        <item name="Hockey" icon="presets/Hockey.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=hockey" />
-            <label text="Edit Hockey" />
             <space />
             <key key="sport" value="hockey" />
@@ -4787,16 +4493,14 @@
             <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" />
         </item>
-        <item name="Pelota" icon="presets/pelota.png" type="node,closedway">
+        <item name="Pelota" icon="presets/pelota.png" type="node,closedway" preset_name_label="true">
             <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" />
             <reference ref="name_leisure_pitch" />
         </item>
-        <item name="Racquet" icon="presets/racquetball.png" type="node,closedway">
+        <item name="Racquet" icon="presets/racquetball.png" type="node,closedway" preset_name_label="true">
             <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" />
@@ -4804,7 +4508,6 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item>
-        <item name="Table Tennis" icon="presets/table_tennis.png" type="node,closedway">
+        <item name="Table Tennis" icon="presets/table_tennis.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=table_tennis" />
-            <label text="Edit Table Tennis" />
             <space />
             <key key="sport" value="table_tennis" />
@@ -4812,7 +4515,6 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item>
-        <item name="Tennis" icon="presets/tennis.png" type="node,closedway">
+        <item name="Tennis" icon="presets/tennis.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=tennis" />
-            <label text="Edit Tennis" />
             <space />
             <key key="sport" value="tennis" />
@@ -4821,6 +4523,5 @@
     </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" />
+        <item name="Motorsport" icon="styles/standard/sport/motor.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="sport" value="motor" />
@@ -4828,6 +4529,5 @@
             <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" />
+        <item name="Karting" icon="presets/karting.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="sport" value="karting" />
@@ -4835,6 +4535,5 @@
             <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" />
+        <item name="Motocross" icon="styles/standard/sport/motocross.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="sport" value="motocross" />
@@ -4842,6 +4541,5 @@
             <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" />
+        <item name="Safety Training" icon="presets/safety_training.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="sport" value="safety_training" />
@@ -4850,6 +4548,5 @@
         </item>
         <separator/>
-        <item name="Model Aerodrome" icon="presets/plane.png" type="node,closedway">
-            <label text="Edit Model Aerodrome" />
+        <item name="Model Aerodrome" icon="presets/plane.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="sport" value="model_aerodrome" />
@@ -4857,6 +4554,5 @@
             <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" />
+        <item name="RC Car" icon="presets/car.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="sport" value="rc_car" />
@@ -4864,7 +4560,6 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
         </item>
-        <item name="Raceway" type="closedway">
+        <item name="Raceway" type="closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=raceway" />
-            <label text="Edit Raceway" />
             <space />
             <key key="highway" value="raceway" />
@@ -4875,5 +4570,5 @@
   <group name="Man Made" icon="presets/works.png">
     <group name="Man Made" icon="presets/works.png">
-        <item name="Building" icon="styles/standard/misc/landmark/building.png" type="node,closedway,relation">
+        <item name="Building" icon="styles/standard/misc/landmark/building.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:building"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:building"
@@ -4888,10 +4583,9 @@
                   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,shed,construction" values_context="building" default="yes" match="keyvalue" values_searchable="true" />
             <text key="name" text="Name" />
         </item>
-        <item name="Residential Building" icon="styles/standard/misc/landmark/building.png" type="node,closedway,relation">
+        <item name="Residential Building" icon="styles/standard/misc/landmark/building.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:building"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:building"
@@ -4903,10 +4597,9 @@
                   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" />
             <space />
             <combo key="building" text="Building" values="residential,apartments,house,hut,dormitory,terrace,detached,roof" default="residential" match="keyvalue" values_context="building" values_searchable="true" />
             <text key="name" text="Name" />
         </item>
-        <item name="Entrance" icon="styles/standard/misc/entrance-yes.png" type="node">
+        <item name="Entrance" icon="styles/standard/misc/entrance-yes.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:entrance"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:entrance"
@@ -4915,5 +4608,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:entrance"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:entrance" />
-            <label text="Edit Entrance" />
             <space />
             <combo key="entrance" text="Entrance" values="yes,main,service,exit,emergency" values_context="entrance" default="yes" match="key" />
@@ -4925,6 +4617,5 @@
             </optional>
         </item>
-        <item name="Tower" icon="presets/tower.png" type="node,closedway">
-            <label text="Edit Tower" />
+        <item name="Tower" icon="presets/tower.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="man_made" value="tower" />
@@ -4936,5 +4627,5 @@
             </optional>
         </item>
-        <item name="Flagpole" icon="presets/flag.png" type="node">
+        <item name="Flagpole" icon="presets/flag.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=flagpole"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=flagpole"
@@ -4943,13 +4634,11 @@
         </item>
         <separator/>
-        <item name="Works" icon="presets/works.png" type="node,closedway">
-            <label text="Edit Works" />
+        <item name="Works" icon="presets/works.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="man_made" value="works" />
             <text key="name" text="Name" />
         </item>
-        <item name="Chimney" icon="presets/chimney.png" type="node">
+        <item name="Chimney" icon="presets/chimney.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Chimney" />
-            <label text="Edit Chimney" />
             <space />
             <key key="man_made" value="chimney" />
@@ -4957,5 +4646,5 @@
             <text key="height" text="Height (meters)" />
         </item>
-        <item name="Windmill" icon="presets/windmill.png" type="node,closedway">
+        <item name="Windmill" icon="presets/windmill.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=windmill"
@@ -4963,21 +4652,18 @@
                   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" />
+        <item name="Gasometer" icon="presets/gasometer.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="man_made" value="gasometer" />
             <text key="name" text="Name" />
         </item>
-        <item name="Pipeline" icon="presets/path.png" type="way">
+        <item name="Pipeline" icon="presets/path.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"
                   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" />
@@ -4986,20 +4672,18 @@
             <combo key="location" text="Location" values="underground,underwater,overground" values_context="pipeline" />
         </item>
-        <item name="Crane" icon="presets/crane.png" type="node,closedway">
+        <item name="Crane" icon="presets/crane.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=crane"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA: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>
-        <item name="Mineshaft" icon="presets/mineshaft.png" type="node,closedway">
+        <item name="Mineshaft" icon="presets/mineshaft.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=mineshaft"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=mineshaft"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA: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" />
@@ -5012,5 +4696,5 @@
             <check key="disused" text="Disused" />
         </item>
-        <item name="Adit" icon="presets/adit.png" type="node">
+        <item name="Adit" icon="presets/adit.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=adit"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=adit"
@@ -5019,5 +4703,4 @@
                   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" />
@@ -5029,11 +4712,10 @@
         </item>
         <separator/>
-        <item name="Water Tower" icon="presets/water_tower.png" type="node,closedway">
-            <label text="Edit Water Tower" />
+        <item name="Water Tower" icon="presets/water_tower.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="man_made" value="water_tower" />
             <text key="name" text="Name" />
         </item>
-        <item name="Water Works" icon="presets/water_works.png" type="node,closedway">
+        <item name="Water Works" icon="presets/water_works.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_works"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=water_works"
@@ -5041,10 +4723,9 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=water_works"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=water_works" />
-            <label text="Edit Water Works" />
             <space />
             <key key="man_made" value="water_works" />
             <reference ref="name_operator" />
         </item>
-        <item name="Wastewater Plant" icon="presets/wastewater_plant.png" type="node,closedway">
+        <item name="Wastewater Plant" icon="presets/wastewater_plant.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
@@ -5054,10 +4735,9 @@
                   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>
-        <item name="Watermill" icon="styles/standard/misc/landmark/watermill.png" type="node,closedway">
+        <item name="Watermill" icon="styles/standard/misc/landmark/watermill.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=watermill"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=watermill"
@@ -5065,10 +4745,9 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=watermill"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=watermill" />
-            <label text="Edit Watermill" />
             <space />
             <key key="man_made" value="watermill" />
             <text key="name" text="Name" />
         </item>
-        <item name="Fountain" icon="presets/spring.png" type="node,closedway">
+        <item name="Fountain" icon="presets/spring.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fountain"
@@ -5079,10 +4758,9 @@
                   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>
-        <item name="Water Well" icon="presets/water_well.png" type="node">
+        <item name="Water Well" icon="presets/water_well.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_well"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=water_well"
@@ -5090,5 +4768,4 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA: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" />
@@ -5096,5 +4773,5 @@
         </item>
         <separator/>
-        <item name="Lighthouse" icon="styles/standard/misc/landmark/lighthouse.png" type="node,closedway">
+        <item name="Lighthouse" icon="styles/standard/misc/landmark/lighthouse.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=lighthouse"
@@ -5102,33 +4779,29 @@
                   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>
-        <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node">
+        <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
                   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>
-        <item name="Street Lamp" icon="styles/standard/misc/streetlamp.png" type="node">
+        <item name="Street Lamp" icon="styles/standard/misc/streetlamp.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=street_lamp"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=street_lamp"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=street_lamp"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=street_lamp" />
-            <label text="Edit Street Lamp" />
             <space />
             <key key="highway" value="street_lamp" />
             <combo key="opening_hours" text="Operation times" values="Mo-Fr 22:00-05:00" />
         </item>
-        <item name="Monitoring Station" icon="presets/monitoring_station.png" type="node,closedway">
+        <item name="Monitoring Station" icon="presets/monitoring_station.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=monitoring_station"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=monitoring_station"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=monitoring_station" />
-            <label text="Edit Monitoring Station" />
             <space />
             <key key="man_made" value="monitoring_station" />
@@ -5160,15 +4833,14 @@
             </checkgroup>
         </item>
-        <item name="Survey Point" icon="presets/survey_point.png" type="node">
+        <item name="Survey Point" icon="presets/survey_point.png" type="node" preset_name_label="true">
             <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"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR: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>
-        <item name="Surveillance Camera" icon="presets/surveillance.png" type="node,closedway">
+        <item name="Surveillance Camera" icon="presets/surveillance.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=surveillance"
@@ -5176,5 +4848,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=surveillance"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=surveillance" />
-            <label text="Edit Surveillance Camera" />
             <space />
             <key key="man_made" value="surveillance" />
@@ -5200,9 +4871,8 @@
     </group> <!-- Man Made -->
     <group name="Power" icon="presets/power.png">
-        <item name="Power Plant" icon="presets/power.png" type="closedway,relation">
+        <item name="Power Plant" icon="presets/power.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=plant"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=plant"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=plant" />
-            <label text="Edit Power Plant" />
             <space />
             <key key="power" value="plant" />
@@ -5225,5 +4895,5 @@
             </optional>
         </item>
-        <item name="Power Generator" icon="presets/power.png" type="node,closedway,relation">
+        <item name="Power Generator" icon="presets/power.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
@@ -5234,5 +4904,4 @@
                   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" />
@@ -5318,10 +4987,9 @@
         </item>
         <separator/>
-        <item name="Power Substation" icon="presets/power.png" type="node,closedway">
+        <item name="Power Substation" icon="presets/power.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=substation"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=substation"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=substation" />
-            <label text="Edit Power Substation" />
             <space />
             <key key="power" value="substation" />
@@ -5337,10 +5005,9 @@
             </optional>
         </item>
-        <item name="Power Transformer" type="node,closedway">
+        <item name="Power Transformer" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=transformer"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=transformer"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=transformer"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=transformer" />
-            <label text="Edit Power Transformer" />
             <space />
             <key key="power" value="transformer" />
@@ -5354,6 +5021,5 @@
             </optional>
         </item>
-        <item name="Power Switchgear" type="closedway">
-            <label text="Edit Power Switchgear" />
+        <item name="Power Switchgear" type="closedway" preset_name_label="true">
             <label text="(Please only use this tag if more detailed mapping using busbars and bays is impossible!)" />
             <space />
@@ -5365,6 +5031,5 @@
             </optional>
         </item>
-        <item name="Power Busbar" type="way">
-            <label text="Edit Power Busbar" />
+        <item name="Power Busbar" type="way" preset_name_label="true">
             <space />
             <key key="power" value="line" />
@@ -5373,6 +5038,5 @@
             <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,high,medium,low,750000;200000,110000;20000" />
         </item>
-        <item name="Power Bay" type="way">
-            <label text="Edit Power Bay" />
+        <item name="Power Bay" type="way" preset_name_label="true">
             <space />
             <key key="power" value="line" />
@@ -5381,14 +5045,13 @@
             <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,high,medium,low,750000;200000,110000;20000" />
         </item>
-        <item name="Power Switch" type="node">
+        <item name="Power Switch" type="node" preset_name_label="true">
             <key key="power" value="switch" />
         </item>
         <separator/>
-        <item name="Cable Distribution Cabinet" icon="presets/power.png" type="node">
+        <item name="Cable Distribution Cabinet" icon="presets/power.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable_distribution_cabinet"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable_distribution_cabinet"
                   it.href="http://wiki.openstreetmap.org/wiki/IT: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" />
@@ -5398,5 +5061,5 @@
         </item>
         <separator/>
-        <item name="Power Tower" icon="presets/power_tower.png" type="node">
+        <item name="Power Tower" icon="presets/power_tower.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=tower"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=tower"
@@ -5408,5 +5071,4 @@
                   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" />
@@ -5416,5 +5078,5 @@
             <combo key="material" text="Material" values="metal,plastic,steel,stone,wood" />
         </item>
-        <item name="Pole" icon="styles/standard/misc/landmark/power/pole.png" type="node">
+        <item name="Pole" icon="styles/standard/misc/landmark/power/pole.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=pole"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=pole"
@@ -5425,5 +5087,4 @@
                   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" />
@@ -5433,5 +5094,5 @@
             <combo key="material" text="Material" values="metal,plastic,steel,stone,wood" />
         </item>
-        <item name="Power Line" icon="presets/power.png" type="way">
+        <item name="Power Line" icon="presets/power.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line"
@@ -5442,5 +5103,4 @@
                   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" />
             <space />
             <combo key="power" text="Line type" values="line,minor_line" default="line" match="keyvalue" />
@@ -5454,21 +5114,19 @@
     </group> <!-- Power -->
     <group name="Historic Places" icon="presets/State_Tourist.png">
-        <item name="Castle" icon="presets/State_Tourist.png" type="node,closedway">
+        <item name="Castle" icon="presets/State_Tourist.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=castle"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=castle" />
-            <label text="Edit Castle" />
             <space />
             <key key="historic" value="castle" />
             <reference ref="name_wikipedia" />
         </item>
-        <item name="Ruins" icon="presets/ruins.png" type="node,closedway">
-            <label text="Edit Ruins" />
+        <item name="Ruins" icon="presets/ruins.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="historic" value="ruins" />
             <reference ref="name_oh" />
         </item>
-        <item name="Archaeological Site" icon="styles/standard/sightseeing/archaeological.png" type="node,closedway">
+        <item name="Archaeological Site" icon="styles/standard/sightseeing/archaeological.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site"
@@ -5476,10 +5134,9 @@
                   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" />
             <reference ref="name_oh" />
         </item>
-        <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway">
+        <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:historic=battlefield"
@@ -5488,12 +5145,10 @@
                   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">
+        <item name="Palaeontological Site" icon="presets/palaeontological_site.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-            <label text="Edit Palaeontological Site" />
             <space />
             <key key="geological" value="palaeontological_site" />
@@ -5501,11 +5156,10 @@
         </item>
         <separator/>
-        <item name="Monument" icon="presets/monument.png" type="node,closedway">
-            <label text="Edit Monument" />
+        <item name="Monument" icon="presets/monument.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="historic" value="monument" />
             <text key="name" text="Name" />
         </item>
-        <item name="Memorial" icon="presets/memorial.png" type="node,closedway">
+        <item name="Memorial" icon="presets/memorial.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=memorial"
@@ -5515,23 +5169,19 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=memorial"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk: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" />
+        <item name="Wayside Cross" icon="presets/wayside_cross.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="historic" value="wayside_cross" />
             <text key="name" text="Name" />
         </item>
-        <item name="Wayside Shrine" icon="presets/wayside_shrine.png" type="node,closedway">
-            <label text="Edit Wayside Shrine" />
+        <item name="Wayside Shrine" icon="presets/wayside_shrine.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="historic" value="wayside_shrine" />
             <text key="name" text="Name" />
         </item>
-        <item name="Boundary Stone" icon="styles/standard/historic/boundary_stone.png" type="node,closedway">
-            <label text="Edit Boundary Stone" />
+        <item name="Boundary Stone" icon="styles/standard/historic/boundary_stone.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="historic" value="boundary_stone" />
@@ -5542,5 +5192,5 @@
   <group name="Shops" icon="styles/standard/shop/mall.png">
     <group name="Food" icon="styles/standard/shop/supermarket.png">
-        <item name="Supermarket" icon="styles/standard/shop/supermarket.png" type="node,closedway">
+        <item name="Supermarket" icon="styles/standard/shop/supermarket.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=supermarket"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=supermarket"
@@ -5549,5 +5199,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=supermarket"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=supermarket" />
-            <label text="Edit Supermarket" />
             <space />
             <key key="shop" value="supermarket" />
@@ -5555,5 +5204,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Convenience Store" icon="presets/convenience.png" type="node,closedway">
+        <item name="Convenience Store" icon="presets/convenience.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=convenience"
@@ -5562,5 +5211,4 @@
                   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" />
@@ -5568,5 +5216,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Kiosk" icon="presets/kiosk.png" type="node,closedway">
+        <item name="Kiosk" icon="presets/kiosk.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=kiosk"
@@ -5575,5 +5223,4 @@
                   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" />
@@ -5582,5 +5229,5 @@
         </item>
         <separator/>
-        <item name="Bakery" icon="presets/baker.png" type="node,closedway">
+        <item name="Bakery" icon="presets/baker.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery"
                   ar.href="http://wiki.openstreetmap.org/wiki/Ar:Tag:shop=bakery"
@@ -5592,5 +5239,4 @@
                   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 Bakery" />
             <space />
             <key key="shop" value="bakery" />
@@ -5598,5 +5244,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Butcher" icon="presets/cow.png" type="node,closedway">
+        <item name="Butcher" icon="presets/cow.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=butcher"
@@ -5607,5 +5253,4 @@
                   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" />
@@ -5613,10 +5258,9 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Seafood" icon="presets/seafood.png" type="node,closedway">
+        <item name="Seafood" icon="presets/seafood.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=seafood"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=seafood"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=seafood"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=seafood" />
-            <label text="Edit Seafood Shop" />
             <space />
             <key key="shop" value="seafood" />
@@ -5624,5 +5268,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Deli (Fine Food)" icon="presets/deli.png" type="node,closedway">
+        <item name="Deli (Fine Food)" icon="presets/deli.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=deli"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=deli"
@@ -5631,5 +5275,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=deli"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=deli" />
-            <label text="Edit Deli (Fine Food)" />
             <space />
             <key key="shop" value="deli" />
@@ -5637,5 +5280,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Confectionery" icon="presets/confectionery.png" type="node,closedway">
+        <item name="Confectionery" icon="presets/confectionery.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=confectionery"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=confectionery"
@@ -5645,5 +5288,4 @@
                   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" />
@@ -5652,5 +5294,5 @@
         </item>
         <separator/>
-        <item name="Marketplace" icon="styles/standard/place/marketplace.png" type="node,way,closedway">
+        <item name="Marketplace" icon="styles/standard/place/marketplace.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=marketplace"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=marketplace"
@@ -5661,5 +5303,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=marketplace"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=marketplace" />
-            <label text="Edit Marketplace" />
             <space />
             <key key="amenity" value="marketplace" />
@@ -5668,5 +5309,5 @@
             <combo key="organic" text="Organic" values="only,yes,no" />
         </item>
-        <item name="Greengrocer" icon="presets/greengrocer.png" type="node,closedway">
+        <item name="Greengrocer" icon="presets/greengrocer.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=greengrocer"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=greengrocer"
@@ -5674,5 +5315,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=greengrocer"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=greengrocer" />
-            <label text="Edit Greengrocer" />
             <space />
             <key key="shop" value="greengrocer" />
@@ -5681,10 +5321,9 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Farm Stand" icon="presets/apple.png" type="node,closedway">
+        <item name="Farm Stand" icon="presets/apple.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=farm"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=farm"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=farm"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=farm" />
-            <label text="Edit Farm Stand" />
             <space />
             <key key="shop" value="farm" />
@@ -5695,19 +5334,17 @@
         </item>
         <separator/>
-        <item name="Organic" type="node,closedway">
+        <item name="Organic" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:organic"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Key:organic" />
-            <label text="Edit Organic/Bio" />
             <space />
             <combo text="Organic/Bio" key="organic" values="only,yes,no" match="key" />
         </item>
-        <item name="Fair Trade" type="node,closedway">
+        <item name="Fair Trade" type="node,closedway" preset_name_label="true">
             <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/>
-        <item name="Alcohol" icon="styles/standard/shop/beverages.png" type="node,closedway">
+        <item name="Alcohol" icon="styles/standard/shop/beverages.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=alcohol"
@@ -5716,5 +5353,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=alcohol"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=alcohol" />
-            <label text="Edit Alcohol Shop" />
             <space />
             <key key="shop" value="alcohol" />
@@ -5722,5 +5358,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Beverages" icon="styles/standard/shop/beverages.png" type="node,closedway">
+        <item name="Beverages" icon="styles/standard/shop/beverages.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beverages"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=beverages"
@@ -5728,5 +5364,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=beverages"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=beverages" />
-            <label text="Edit Beverages Shop" />
             <space />
             <key key="shop" value="beverages" />
@@ -5736,5 +5371,5 @@
     </group> <!-- Food -->
     <group name="Clothes" icon="styles/standard/shop/clothes.png">
-        <item name="Clothes" icon="styles/standard/shop/clothes.png" type="node,closedway">
+        <item name="Clothes" icon="styles/standard/shop/clothes.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=clothes"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=clothes"
@@ -5744,5 +5379,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=clothes"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=clothes" />
-            <label text="Edit Clothes Shop" />
             <space />
             <key key="shop" value="clothes" />
@@ -5752,5 +5386,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Boutique" icon="presets/boutique.png" type="node,closedway">
+        <item name="Boutique" icon="presets/boutique.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=boutique"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=boutique"
@@ -5758,5 +5392,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=boutique"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=boutique" />
-            <label text="Edit Boutique" />
             <space />
             <key key="shop" value="boutique" />
@@ -5764,10 +5397,9 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway">
+        <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=shoes"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=shoes"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=shoes"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=shoes" />
-            <label text="Edit Shoe Shop" />
             <space />
             <key key="shop" value="shoes" />
@@ -5777,5 +5409,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Outdoor" icon="presets/tent.png" type="node,closedway">
+        <item name="Outdoor" icon="presets/tent.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=outdoor"
@@ -5783,5 +5415,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=outdoor"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=outdoor" />
-            <label text="Edit Outdoor Shop" />
             <space />
             <key key="shop" value="outdoor" />
@@ -5789,9 +5420,8 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Sports" icon="presets/rowing.png" type="node,closedway">
+        <item name="Sports" icon="presets/rowing.png" type="node,closedway" preset_name_label="true">
              <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=sports"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=sports"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=sports" />
-            <label text="Edit Sports Shop" />
             <space />
             <key key="shop" value="sports" />
@@ -5800,5 +5430,5 @@
         </item>
         <separator/>
-        <item name="Dry Cleaning" icon="presets/laundry.png" type="node,closedway">
+        <item name="Dry Cleaning" icon="presets/laundry.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=dry_cleaning"
@@ -5806,5 +5436,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=dry_cleaning"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=dry_cleaning" />
-            <label text="Edit Dry Cleaning" />
             <space />
             <key key="shop" value="dry_cleaning" />
@@ -5812,10 +5441,9 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Laundry" icon="presets/laundry.png" type="node,closedway">
+        <item name="Laundry" icon="presets/laundry.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=laundry"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=laundry"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=laundry"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=laundry" />
-            <label text="Edit Laundry" />
             <space />
             <key key="shop" value="laundry" />
@@ -5823,6 +5451,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Tailor" icon="styles/standard/shop/tailor.png" type="node,closedway">
-            <label text="Edit Tailor" />
+        <item name="Tailor" icon="styles/standard/shop/tailor.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="shop" value="tailor" />
@@ -5830,10 +5457,9 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Fabric" icon="presets/fabric.png" type="node,closedway">
+        <item name="Fabric" icon="presets/fabric.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=fabric"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=fabric"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=fabric"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=fabric" />
-            <label text="Edit Fabric Shop" />
             <space />
             <key key="shop" value="fabric" />
@@ -5843,5 +5469,5 @@
     </group> <!-- Clothes -->
     <group name="Electronic" icon="styles/standard/shop/electronics.png">
-        <item name="Computer" icon="styles/standard/shop/computer.png" type="node,closedway">
+        <item name="Computer" icon="styles/standard/shop/computer.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=computer"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=computer"
@@ -5849,5 +5475,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=computer"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=computer" />
-            <label text="Edit Computer Shop" />
             <space />
             <key key="shop" value="computer" />
@@ -5855,10 +5480,9 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway">
+        <item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=electronics"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=electronics"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=electronics"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=electronics" />
-            <label text="Edit Electronics Shop" />
             <space />
             <key key="shop" value="electronics" />
@@ -5866,9 +5490,8 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Mobile Phone" icon="presets/mobile_phone.png" type="node,closedway">
+        <item name="Mobile Phone" icon="presets/mobile_phone.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mobile_phone"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=mobile_phone"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=mobile_phone" />
-            <label text="Edit Mobile Phone Shop" />
             <space />
             <key key="shop" value="mobile_phone" />
@@ -5876,9 +5499,8 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Vacuum Cleaner" icon="presets/vacuum_cleaner.png" type="node,closedway">
+        <item name="Vacuum Cleaner" icon="presets/vacuum_cleaner.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=vacuum_cleaner"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=vacuum_cleaner"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=vacuum_cleaner" />
-            <label text="Edit Vacuum Cleaner Shop" />
             <space />
             <key key="shop" value="vacuum_cleaner" />
@@ -5886,10 +5508,9 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Hifi" icon="styles/standard/shop/hifi.png" type="node,closedway">
+        <item name="Hifi" icon="styles/standard/shop/hifi.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hifi"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=hifi"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hifi"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=hifi" />
-            <label text="Edit Hifi Shop" />
             <space />
             <key key="shop" value="hifi" />
@@ -5897,10 +5518,9 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Video" icon="styles/standard/shop/video.png" type="node,closedway">
+        <item name="Video" icon="styles/standard/shop/video.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=video"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=video"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=video"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=video" />
-            <label text="Edit Video Shop" />
             <space />
             <key key="shop" value="video" />
@@ -5910,5 +5530,5 @@
     </group> <!-- Electronic -->
     <group name="Cash" icon="presets/dollar.png">
-        <item name="Bank" icon="styles/standard/money/bank.png" type="node,closedway">
+        <item name="Bank" icon="styles/standard/money/bank.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bank"
@@ -5921,5 +5541,4 @@
                   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" />
@@ -5928,5 +5547,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway">
+        <item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bureau_de_change"
@@ -5935,5 +5554,4 @@
                   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" />
@@ -5941,5 +5559,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Automated Teller Machine" icon="styles/standard/money/atm.png" type="node">
+        <item name="Automated Teller Machine" icon="styles/standard/money/atm.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=atm"
@@ -5953,5 +5571,4 @@
                   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" />
@@ -5960,9 +5577,8 @@
             <reference ref="oh" />
         </item>
-        <item name="Pawnbroker" icon="presets/pawnbroker.svg" type="node,closedway">
+        <item name="Pawnbroker" icon="presets/pawnbroker.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=pawnbroker"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=pawnbroker"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=pawnbroker" />
-            <label text="Edit Pawnbroker" />
             <space />
             <key key="shop" value="pawnbroker" />
@@ -5972,5 +5588,5 @@
     </group> <!-- Cash -->
     <group name="Other" icon="styles/standard/shop/mall.png">
-        <item name="Department Store" icon="styles/standard/shop/mall.png" type="node,closedway">
+        <item name="Department Store" icon="styles/standard/shop/mall.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=department_store"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=department_store"
@@ -5978,5 +5594,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=department_store"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=department_store" />
-            <label text="Edit Department Store" />
             <space />
             <key key="shop" value="department_store" />
@@ -5984,5 +5599,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Mall" icon="styles/standard/shop/mall.png" type="node,closedway">
+        <item name="Mall" icon="styles/standard/shop/mall.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mall"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=mall"
@@ -5990,5 +5605,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=mall"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=mall" />
-            <label text="Edit Mall" />
             <space />
             <key key="shop" value="mall" />
@@ -5997,5 +5611,5 @@
         </item>
         <separator/>
-        <item name="Chemist" icon="styles/standard/shop/chemist.png" type="node,closedway">
+        <item name="Chemist" icon="styles/standard/shop/chemist.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=chemist"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=chemist"
@@ -6003,5 +5617,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=chemist"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=chemist" />
-            <label text="Edit Chemist" />
             <space />
             <key key="shop" value="chemist" />
@@ -6009,5 +5622,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Hairdresser" icon="styles/standard/shop/hairdresser.png" type="node,closedway">
+        <item name="Hairdresser" icon="styles/standard/shop/hairdresser.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hairdresser"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=hairdresser"
@@ -6016,5 +5629,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hairdresser"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=hairdresser" />
-            <label text="Edit Hairdresser" />
             <space />
             <key key="shop" value="hairdresser" />
@@ -6022,9 +5634,8 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway">
+        <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=optician"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=optician"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=optician" />
-            <label text="Edit Optician" />
             <space />
             <key key="shop" value="optician" />
@@ -6032,9 +5643,8 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Jewelry" icon="styles/standard/shop/jewelry.png" type="node,closedway">
+        <item name="Jewelry" icon="styles/standard/shop/jewelry.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=jewelry"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=jewelry"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=jewelry" />
-            <label text="Edit Jewelry" />
             <space />
             <key key="shop" value="jewelry" />
@@ -6042,5 +5652,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Gift" icon="presets/present.svg" type="node,closedway">
+        <item name="Gift" icon="presets/present.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=gift"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=gift"
@@ -6049,5 +5659,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=gift"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=gift" />
-            <label text="Edit Gift Shop" />
             <space />
             <key key="shop" value="gift" />
@@ -6059,9 +5668,8 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Erotic" icon="presets/erotic.png" type="node,closedway">
+        <item name="Erotic" icon="presets/erotic.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=erotic"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=erotic"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=erotic" />
-            <label text="Edit Erotic Shop" />
             <space />
             <key key="shop" value="erotic" />
@@ -6070,5 +5678,5 @@
         </item>
         <separator/>
-        <item name="Florist" icon="styles/standard/shop/florist.png" type="node,closedway">
+        <item name="Florist" icon="styles/standard/shop/florist.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=florist"
@@ -6077,5 +5685,4 @@
                   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" />
@@ -6083,5 +5690,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Garden Centre" icon="styles/standard/shop/garden_centre.png" type="node,closedway">
+        <item name="Garden Centre" icon="styles/standard/shop/garden_centre.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=garden_centre"
@@ -6091,5 +5698,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=garden_centre"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=garden_centre" />
-            <label text="Edit Garden Centre" />
             <space />
             <key key="shop" value="garden_centre" />
@@ -6098,5 +5704,5 @@
         </item>
         <separator/>
-        <item name="Do-it-yourself-store" icon="presets/diy_store.png" type="node,closedway">
+        <item name="Do-it-yourself-store" icon="presets/diy_store.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=doityourself"
@@ -6105,5 +5711,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=doityourself"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=doityourself" />
-            <label text="Edit Do-it-yourself-store" />
             <space />
             <key key="shop" value="doityourself" />
@@ -6111,5 +5716,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Hardware" icon="presets/hardware.png" type="node,closedway">
+        <item name="Hardware" icon="presets/hardware.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=hardware"
@@ -6117,5 +5722,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hardware"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=hardware" />
-            <label text="Edit Hardware Store" />
             <space />
             <key key="shop" value="hardware" />
@@ -6123,10 +5727,9 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Paint" icon="presets/paint.png" type="node,closedway">
+        <item name="Paint" icon="presets/paint.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=paint"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=paint"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=paint"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=paint" />
-            <label text="Edit Paint Shop" />
             <space />
             <key key="shop" value="paint" />
@@ -6135,6 +5738,5 @@
         </item>
         <separator/>
-        <item name="Furniture" icon="styles/standard/shop/furniture.png" type="node,closedway">
-            <label text="Edit Furniture Shop" />
+        <item name="Furniture" icon="styles/standard/shop/furniture.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="shop" value="furniture" />
@@ -6142,5 +5744,5 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Kitchen" icon="presets/kitchen.png" type="node,closedway">
+        <item name="Kitchen" icon="presets/kitchen.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kitchen"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=kitchen"
@@ -6148,5 +5750,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=kitchen"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=kitchen" />
-            <label text="Edit Kitchen Store" />
             <space />
             <key key="shop" value="kitchen" />
@@ -6154,9 +5755,8 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Curtain" icon="presets/curtain.png" type="node,closedway">
+        <item name="Curtain" icon="presets/curtain.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=curtain"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=curtain"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=curtain" />
-            <label text="Edit Curtain Shop" />
             <space />
             <key key="shop" value="curtain" />
@@ -6164,10 +5764,9 @@
             <reference ref="link_contact" />
         </item>
-        <item name="Frame" icon="presets/frame.png" type="node,closedway">
+        <item name="Frame" icon="presets/frame.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=frame"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=frame"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=frame"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=frame" />
-            <label text="Edit Frames Shop" />
             <space />
             <key key="shop" value="frame" />
@@ -6176,5 +5775,5 @@
         </item>
         <separator/>
-        <item name="Stationery" icon="presets/stationery.png" type="node,closedway">
+        <item name="Stationery" icon="presets/stationery.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=stationery"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=stationery"
@@ -6182,10 +5781,9 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=stationery"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=stationery" />
-            <label text="Edit Stationery Shop" />
             <space />
             <key key="shop" value="stationery" />
             <reference ref="name_oh" />
         </item>
-        <item name="Copyshop" icon="presets/copyshop.png" type="node,closedway">
+        <item name="Copyshop" icon="presets/copyshop.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=copyshop"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=copyshop"
@@ -6193,10 +5791,9 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=copyshop"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=copyshop" />
-            <label text="Edit Copyshop" />
             <space />
             <key key="shop" value="copyshop" />
             <reference ref="name_operator_oh" />
         </item>
-        <item name="Book Store" icon="presets/book.png" type="node,closedway">
+        <item name="Book Store" icon="presets/book.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=books"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=books"
@@ -6205,5 +5802,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=books"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=books" />
-            <label text="Edit Book Store" />
             <space />
             <key key="shop" value="books" />
@@ -6211,5 +5807,5 @@
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
         </item>
-        <item name="Newsagent's shop" icon="presets/kiosk.png" type="node,closedway">
+        <item name="Newsagent's shop" icon="presets/kiosk.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=newsagent"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=newsagent"
@@ -6218,5 +5814,4 @@
                   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" />
@@ -6224,22 +5819,20 @@
         </item>
         <separator/>
-        <item name="Travel Agency" icon="presets/travel.png" type="node,closedway">
+        <item name="Travel Agency" icon="presets/travel.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=travel_agency"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=travel_agency" />
-            <label text="Edit Travel Agency" />
             <space />
             <key key="shop" value="travel_agency" />
             <reference ref="name_brand_oh" />
         </item>
-        <item name="Musical Instrument" icon="presets/musical_instrument.png" type="node,closedway">
+        <item name="Musical Instrument" icon="presets/musical_instrument.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=musical_instrument"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=musical_instrument"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=musical_instrument" />
-            <label text="Edit Musical Instruments Shop" />
             <space />
             <key key="shop" value="musical_instrument" />
             <reference ref="name_operator_oh" />
         </item>
-        <item name="Toys" icon="styles/standard/shop/toys.png" type="node,closedway">
+        <item name="Toys" icon="styles/standard/shop/toys.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=toys"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=toys"
@@ -6247,15 +5840,13 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=toys"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=toys" />
-            <label text="Edit Toy Shop" />
             <space />
             <key key="shop" value="toys" />
             <reference ref="name_oh" />
         </item>
-        <item name="Variety Store" icon="presets/variety_store.png" type="node,closedway">
+        <item name="Variety Store" icon="presets/variety_store.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=variety_store"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=variety_store"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=variety_store"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=variety_store" />
-            <label text="Edit Variety Store" />
             <space />
             <key key="shop" value="variety_store" />
@@ -6263,10 +5854,9 @@
         </item>
     </group> <!-- Other -->
-    <item name="Vending machine" icon="presets/vending_machine.png" type="node">
+    <item name="Vending machine" icon="presets/vending_machine.png" type="node" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"
                   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" />
@@ -6280,11 +5870,10 @@
   <group name="Geography" icon="presets/peak.svg">
     <group name="Boundaries" icon="presets/boundaries.png">
-        <item name="National" icon="presets/boundaries.png" type="closedway,relation">
-            <label text="Edit National Boundary" />
+        <item name="National" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
             <space />
             <key key="boundary" value="national" />
             <text key="name" text="Name" />
         </item>
-        <item name="Administrative" icon="presets/boundaries.png" type="closedway,relation">
+        <item name="Administrative" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:boundary=administrative"
@@ -6293,13 +5882,11 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:boundary=administrative"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:boundary=administrative" />
-            <label text="Edit Administrative Boundary" />
             <space />
             <key key="boundary" value="administrative" />
             <text key="name" text="Name" />
         </item>
-        <item name="Political" icon="presets/boundaries.png" type="closedway,relation">
+        <item name="Political" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=political"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:boundary=political" />
-            <label text="Edit Political Boundary" />
             <space />
             <key key="boundary" value="political" />
@@ -6307,17 +5894,15 @@
             <text key="name" text="Name" />
         </item>
-        <item name="Postal Code" icon="presets/boundaries.png" type="closedway,relation">
+        <item name="Postal Code" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=postal_code" />
-            <label text="Edit Postal Code Boundary" />
             <space />
             <key key="boundary" value="postal_code" />
             <text key="postal_code" text="Postal Code" />
         </item>
-        <item name="National park" icon="presets/boundaries.png" type="closedway,relation">
+        <item name="National park" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=national_park"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:boundary=national_park"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:boundary=national_park"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:boundary=national_park" />
-            <label text="Edit National Park Boundary" />
             <space />
             <key key="boundary" value="national_park" />
@@ -6326,30 +5911,25 @@
     </group> <!-- Boundaries -->
     <group name="Places" icon="presets/places.png">
-        <item name="Continent" icon="presets/places.png" type="node,closedway">
-            <label text="Edit Continent" />
+        <item name="Continent" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="place" value="continent" />
             <reference ref="name_wikipedia" />
         </item>
-        <item name="Country" icon="presets/places.png" type="node,closedway">
-            <label text="Edit Country" />
+        <item name="Country" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="place" value="country" />
             <reference ref="name_wikipedia" />
         </item>
-        <item name="State" icon="presets/places.png" type="node,closedway">
-            <label text="Edit State" />
+        <item name="State" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="place" value="state" />
             <reference ref="name_wikipedia" />
         </item>
-        <item name="Region" icon="presets/places.png" type="node,closedway">
-            <label text="Edit Region" />
+        <item name="Region" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="place" value="region" />
             <reference ref="name_wikipedia" />
         </item>
-        <item name="County" icon="presets/places.png" type="node,closedway">
-            <label text="Edit County" />
+        <item name="County" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="place" value="county" />
@@ -6358,6 +5938,5 @@
         </item>
         <separator/>
-        <item name="City" icon="presets/places.png" type="node,closedway">
-            <label text="Edit City" />
+        <item name="City" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="place" value="city" />
@@ -6365,5 +5944,5 @@
             <reference ref="population_postcode_website" />
         </item>
-        <item name="Town" icon="presets/places.png" type="node,closedway">
+        <item name="Town" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:place=town"
@@ -6372,5 +5951,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=town"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=town" />
-            <label text="Edit Town" />
             <space />
             <key key="place" value="town" />
@@ -6378,5 +5956,5 @@
             <reference ref="population_postcode_website" />
         </item>
-        <item name="Suburb" icon="presets/places.png" type="node,closedway">
+        <item name="Suburb" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=suburb"
@@ -6385,5 +5963,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=suburb"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=suburb" />
-            <label text="Edit Suburb" />
             <space />
             <key key="place" value="suburb" />
@@ -6391,6 +5968,5 @@
             <reference ref="population_postcode_website" />
         </item>
-        <item name="Village" icon="presets/places.png" type="node,closedway">
-            <label text="Edit Village" />
+        <item name="Village" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="place" value="village" />
@@ -6398,6 +5974,5 @@
             <reference ref="population_postcode_website" />
         </item>
-        <item name="Hamlet" icon="presets/places.png" type="node,closedway">
-            <label text="Edit Hamlet" />
+        <item name="Hamlet" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="place" value="hamlet" />
@@ -6405,6 +5980,5 @@
             <reference ref="population_postcode_website" />
         </item>
-        <item name="Isolated Dwelling" icon="presets/places.png" type="node,closedway">
-            <label text="Edit Isolated Dwelling" />
+        <item name="Isolated Dwelling" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="place" value="isolated_dwelling" />
@@ -6412,5 +5986,5 @@
             <reference ref="population_postcode_website" />
         </item>
-        <item name="Neighbourhood" icon="presets/places.png" type="node,closedway">
+        <item name="Neighbourhood" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=neighbourhood"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=neighbourhood"
@@ -6419,5 +5993,4 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=neighbourhood"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=neighbourhood" />
-            <label text="Edit Neighbourhood" />
             <space />
             <key key="place" value="neighbourhood" />
@@ -6427,5 +6000,5 @@
         </item>
         <separator/>
-        <item name="Locality" icon="presets/locality.png" type="node,closedway">
+        <item name="Locality" icon="presets/locality.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=locality"
@@ -6434,5 +6007,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=locality"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=locality" />
-            <label text="Edit Locality" />
             <space />
             <key key="place" value="locality" />
@@ -6441,5 +6013,5 @@
     </group> <!-- Places -->
     <group name="Geography" icon="presets/peak.svg">
-        <item name="Peak" icon="presets/peak.svg" type="node">
+        <item name="Peak" icon="presets/peak.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=peak"
@@ -6447,5 +6019,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=peak"
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:natural=peak" />
-            <label text="Edit Peak" />
             <space />
             <key key="natural" value="peak" />
@@ -6453,10 +6024,9 @@
             <text key="ele" text="Elevation" />
         </item>
-        <item name="Saddle" icon="presets/saddle.svg" type="node">
+        <item name="Saddle" icon="presets/saddle.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=saddle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=saddle"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=saddle"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=saddle" />
-            <label text="Edit Saddle" />
             <space/>
             <key key="natural" value="saddle" />
@@ -6464,10 +6034,9 @@
             <text key="ele" text="Elevation" />
         </item>
-        <item name="Glacier" icon="presets/glacier.png" type="node,closedway">
+        <item name="Glacier" icon="presets/glacier.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=glacier"
                   es.href="http://wiki.openstreetmap.org/wiki/ES: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" />
@@ -6475,10 +6044,9 @@
             <text key="ele" text="Elevation" />
         </item>
-        <item name="Volcano" icon="presets/volcano.png" type="node,closedway">
+        <item name="Volcano" icon="presets/volcano.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=volcano"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=volcano"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=volcano" />
-            <label text="Edit Volcano" />
             <space />
             <key key="natural" value="volcano" />
@@ -6486,9 +6054,8 @@
             <text key="ele" text="Elevation" />
         </item>
-        <item name="Cave Entrance" icon="presets/cave_entrance.png" type="node,closedway">
+        <item name="Cave Entrance" icon="presets/cave_entrance.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl: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" />
@@ -6496,5 +6063,5 @@
         </item>
         <separator/>
-        <item name="Island" icon="presets/island.png" type="node,closedway">
+        <item name="Island" icon="presets/island.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=island"
@@ -6502,15 +6069,13 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=island"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=island" />
-            <label text="Edit Island" />
             <space />
             <key key="place" value="island" />
             <reference ref="name_wikipedia" />
         </item>
-        <item name="Islet" icon="presets/islet.png" type="node,closedway">
+        <item name="Islet" icon="presets/islet.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=islet"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=islet"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=islet" />
-            <label text="Edit Islet" />
             <space />
             <key key="place" value="islet" />
@@ -6519,5 +6084,5 @@
     </group> <!-- Geography -->
     <group name="Nature" icon="presets/tree.png">
-        <item name="Tree" icon="presets/tree.png" type="node">
+        <item name="Tree" icon="presets/tree.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=tree"
@@ -6529,5 +6094,4 @@
                   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" />
@@ -6542,5 +6106,5 @@
             </optional>
         </item>
-        <item name="Tree Row" icon="presets/tree.png" type="way">
+        <item name="Tree Row" icon="presets/tree.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree_row"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=tree_row"
@@ -6551,5 +6115,5 @@
             <key key="natural" value="tree_row" />
         </item>
-        <item name="Wood" icon="presets/landuse.png" type="node,closedway,relation">
+        <item name="Wood" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood"
@@ -6557,5 +6121,4 @@
                   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" />
@@ -6563,5 +6126,5 @@
             <combo key="wood" text="Type" values="coniferous,deciduous,mixed" />
         </item>
-        <item name="Forest" icon="presets/landuse.png" type="node,closedway,relation">
+        <item name="Forest" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest"
@@ -6570,5 +6133,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=forest"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=forest" />
-            <label text="Edit Forest Landuse" />
             <space />
             <key key="landuse" value="forest" />
@@ -6576,5 +6138,5 @@
             <combo key="wood" text="Type" values="coniferous,deciduous,mixed" />
         </item>
-        <item name="Grassland" icon="presets/landuse.png" type="node,closedway,relation">
+        <item name="Grassland" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=grassland"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=grassland"
@@ -6585,5 +6147,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=grassland"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:natural=grassland" />
-            <label text="Edit Grassland" />
             <space />
             <key key="natural" value="grassland" />
@@ -6591,6 +6152,5 @@
             <combo key="grassland" text="Type" values="pampas,prairie,puszta,savanna,steppe,veld" />
         </item>
-        <item name="Nature Reserve" icon="styles/standard/leisure/nature_reserve.png" type="node,closedway,relation">
-            <label text="Edit Nature Reserve" />
+        <item name="Nature Reserve" icon="styles/standard/leisure/nature_reserve.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="leisure" value="nature_reserve" />
@@ -6598,27 +6158,24 @@
         </item>
         <separator/>
-        <item name="Scree" icon="presets/empty.png" type="node,closedway,relation">
-            <label text="Edit Scree" />
+        <item name="Scree" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="natural" value="scree" />
             <text key="name" text="Name" />
         </item>
-        <item name="Fell" icon="presets/empty.png" type="node,closedway,relation">
+        <item name="Fell" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=fell"
                   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" />
+        <item name="Scrub" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="natural" value="scrub" />
             <text key="name" text="Name" />
         </item>
-        <item name="Heath" icon="presets/empty.png" type="node,closedway,relation">
+        <item name="Heath" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=heath"
@@ -6627,14 +6184,12 @@
                   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>
-        <item name="Sand" icon="presets/empty.png" type="closedway,relation">
+        <item name="Sand" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=sand"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=sand"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=sand" />
-            <label text="Edit Sand" />
             <space />
             <key key="natural" value="sand" />
@@ -6643,5 +6198,5 @@
     </group> <!-- Nature -->
     <group name="Land use" icon="presets/landuse.png">
-        <item name="Farmyard" icon="presets/landuse.png" type="closedway,relation">
+        <item name="Farmyard" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard"
@@ -6650,22 +6205,19 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:landuse=farmyard"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=farmyard" />
-            <label text="Edit Farmyard Landuse" />
             <space />
             <key key="landuse" value="farmyard" />
             <text key="name" text="Name" />
         </item>
-        <item name="Farmland" icon="presets/landuse.png" type="closedway,relation">
-            <label text="Edit Farmland Landuse" />
+        <item name="Farmland" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
             <space />
             <key key="landuse" value="farmland" />
             <text key="name" text="Name" />
         </item>
-        <item name="Meadow" icon="presets/landuse.png" type="node,closedway,relation">
-            <label text="Edit Meadow Landuse" />
+        <item name="Meadow" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="landuse" value="meadow" />
             <text key="name" text="Name" />
         </item>
-        <item name="Orchard" icon="presets/landuse.png" type="closedway,relation">
+        <item name="Orchard" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=orchard"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=orchard"
@@ -6674,16 +6226,14 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=orchard"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=orchard" />
-            <label text="Edit Orchard Landuse" />
             <space />
             <key key="landuse" value="orchard" />
             <text key="name" text="Name" />
         </item>
-        <item name="Vineyard" icon="presets/fruits.png" type="node,closedway,relation">
-            <label text="Edit Vineyard Landuse" />
+        <item name="Vineyard" icon="presets/fruits.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="landuse" value="vineyard" />
             <text key="name" text="Name" />
         </item>
-        <item name="Greenhouse Horticulture" icon="presets/greenhouse_horticulture.png" type="closedway">
+        <item name="Greenhouse Horticulture" icon="presets/greenhouse_horticulture.png" type="closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=greenhouse_horticulture"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=greenhouse_horticulture"
@@ -6691,5 +6241,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=greenhouse_horticulture"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=greenhouse_horticulture" />
-            <label text="Edit Greenhouse Horticulture" />
             <space />
             <key key="landuse" value="greenhouse_horticulture" />
@@ -6697,6 +6246,5 @@
             <text key="operator" text="Operator" />
         </item>
-        <item name="Allotments" icon="presets/landuse.png" type="node,closedway,relation">
-            <label text="Edit Allotments Landuse" />
+        <item name="Allotments" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="landuse" value="allotments" />
@@ -6704,17 +6252,15 @@
         </item>
         <separator/>
-        <item name="Garden" icon="presets/empty.png" type="node,closedway,relation">
-            <label text="Edit Garden" />
+        <item name="Garden" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="leisure" value="garden" />
             <text key="name" text="Name" />
         </item>
-        <item name="Grass" icon="presets/landuse.png" type="node,closedway,relation">
-            <label text="Edit Grass Landuse" />
+        <item name="Grass" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="landuse" value="grass" />
             <text key="name" text="Name" />
         </item>
-        <item name="Village Green" icon="presets/landuse.png" type="node,closedway,relation">
+        <item name="Village Green" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=village_green"
@@ -6723,24 +6269,21 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=village_green"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=village_green" />
-            <label text="Edit Village Green Landuse" />
             <space />
             <key key="landuse" value="village_green" />
             <text key="name" text="Name" />
         </item>
-        <item name="Common" icon="presets/empty.png" type="node,closedway,relation">
+        <item name="Common" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common"
                   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" />
+        <item name="Park" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="leisure" value="park" />
             <text key="name" text="Name" />
         </item>
-        <item name="Recreation Ground" icon="presets/landuse.png" type="node,closedway,relation">
+        <item name="Recreation Ground" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=recreation_ground"
@@ -6748,5 +6291,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=recreation_ground"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=recreation_ground" />
-            <label text="Edit Recreation Ground Landuse" />
             <space />
             <key key="landuse" value="recreation_ground" />
@@ -6754,11 +6296,10 @@
         </item>
         <separator/>
-        <item name="Residential Area" icon="styles/standard/misc/landmark/building.png" type="closedway,relation">
-            <label text="Edit Residential Landuse" />
+        <item name="Residential Area" icon="styles/standard/misc/landmark/building.png" type="closedway,relation" preset_name_label="true">
             <space />
             <key key="landuse" value="residential" />
             <text key="name" text="Name" />
         </item>
-        <item name="Graveyard" icon="presets/graveyard.png" type="node,closedway,relation">
+        <item name="Graveyard" icon="presets/graveyard.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=grave_yard"
@@ -6769,5 +6310,4 @@
                   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" />
@@ -6776,5 +6316,5 @@
             <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
         </item>
-        <item name="Cemetery" icon="presets/cemetery.png" type="node,closedway,relation">
+        <item name="Cemetery" icon="presets/cemetery.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=cemetery"
@@ -6786,5 +6326,4 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=cemetery"
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:landuse=cemetery" />
-            <label text="Edit Cemetery Landuse" />
             <space />
             <key key="landuse" value="cemetery" />
@@ -6793,5 +6332,5 @@
             <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
         </item>
-        <item name="Retail" icon="styles/standard/shop/supermarket.png" type="node,closedway,relation">
+        <item name="Retail" icon="styles/standard/shop/supermarket.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=retail"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=retail"
@@ -6799,10 +6338,9 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=retail"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=retail" />
-            <label text="Edit Retail Landuse" />
             <space />
             <key key="landuse" value="retail" />
             <text key="name" text="Name" />
         </item>
-        <item name="Commercial" icon="presets/empty.png" type="node,closedway,relation">
+        <item name="Commercial" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=commercial"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=commercial"
@@ -6810,10 +6348,9 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=commercial"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=commercial" />
-            <label text="Edit Commercial Landuse" />
             <space />
             <key key="landuse" value="commercial" />
             <text key="name" text="Name" />
         </item>
-        <item name="Industrial" icon="presets/works.png" type="node,closedway,relation">
+        <item name="Industrial" icon="presets/works.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=industrial"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=industrial"
@@ -6823,10 +6360,9 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=industrial"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=industrial" />
-            <label text="Edit Industrial Landuse" />
             <space />
             <key key="landuse" value="industrial" />
             <text key="name" text="Name" />
         </item>
-        <item name="Garages" icon="presets/garages.png" type="closedway">
+        <item name="Garages" icon="presets/garages.png" type="closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=garages"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=garages"
@@ -6835,5 +6371,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=garages"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=garages" />
-            <label text="Edit Garages" />
             <space />
             <key key="landuse" value="garages" />
@@ -6841,5 +6376,5 @@
             <text key="operator" text="Operator" />
         </item>
-        <item name="Railway land" icon="presets/rail_light.png" type="closedway,relation">
+        <item name="Railway land" icon="presets/rail_light.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=railway"
@@ -6848,10 +6383,9 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=railway"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=railway" />
-            <label text="Edit Railway Landuse" />
             <space />
             <key key="landuse" value="railway" />
             <text key="name" text="Name" />
         </item>
-        <item name="Military" icon="presets/military.png" type="node,closedway,relation">
+        <item name="Military" icon="presets/military.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=military"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=military"
@@ -6859,5 +6393,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=military"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=military" />
-            <label text="Edit Military Landuse" />
             <space />
             <key key="landuse" value="military" />
@@ -6865,5 +6398,5 @@
         </item>
         <separator/>
-        <item name="Construction area" icon="presets/construction.png" type="node,closedway,relation">
+        <item name="Construction area" icon="presets/construction.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=construction"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=construction"
@@ -6872,10 +6405,9 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=construction"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=construction" />
-            <label text="Edit Construction Landuse" />
             <space />
             <key key="landuse" value="construction" />
             <text key="name" text="Name" />
         </item>
-        <item name="Brownfield" icon="presets/landuse.png" type="node,closedway,relation">
+        <item name="Brownfield" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=brownfield"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=brownfield"
@@ -6883,20 +6415,18 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:landuse=brownfield"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=brownfield" />
-            <label text="Edit Brownfield Landuse" />
             <space />
             <key key="landuse" value="brownfield" />
             <text key="name" text="Name" />
         </item>
-        <item name="Greenfield" icon="presets/landuse.png" type="node,closedway,relation">
+        <item name="Greenfield" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=greenfield"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=greenfield"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=greenfield"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=greenfield" />
-            <label text="Edit Greenfield Landuse" />
             <space />
             <key key="landuse" value="greenfield" />
             <text key="name" text="Name" />
         </item>
-        <item name="Landfill" icon="presets/landuse.png" type="node,closedway,relation">
+        <item name="Landfill" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=landfill"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=landfill"
@@ -6905,10 +6435,9 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=landfill"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=landfill" />
-            <label text="Edit Landfill Landuse" />
             <space />
             <key key="landuse" value="landfill" />
             <text key="name" text="Name" />
         </item>
-        <item name="Quarry" icon="presets/mine.png" type="node,closedway,relation">
+        <item name="Quarry" icon="presets/mine.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=quarry"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=quarry"
@@ -6917,5 +6446,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=quarry"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=quarry" />
-            <label text="Edit Quarry Landuse" />
             <space />
             <key key="landuse" value="quarry" />
@@ -6925,5 +6453,5 @@
   </group>
     <group name="Annotation" icon="presets/addresses.png">
-        <item name="Name" icon="presets/message.png" type="node,way,closedway,relation">
+        <item name="Name" icon="presets/message.png" type="node,way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:name"
                   ar.href="http://wiki.openstreetmap.org/wiki/Ar:Key:name"
@@ -6942,5 +6470,4 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:name"
                   zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Key:name" />
-            <label text="Edit Name Information" />
             <space />
             <text key="name" text="Name" />
@@ -6956,5 +6483,5 @@
             </optional>
         </item>
-        <item name="Addresses" icon="presets/addresses.png" type="node,way,closedway,relation">
+        <item name="Addresses" icon="presets/addresses.png" type="node,way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:addr"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:addr"
@@ -6969,5 +6496,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:addr"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:addr" />
-            <label text="Edit Address Information" />
             <space />
             <text key="addr:housenumber" text="House number" match="key" auto_increment="-2,-1,+1,+2" />
@@ -6980,5 +6506,5 @@
             </optional>
         </item>
-        <item name="Address Interpolation" icon="presets/interpolation.png" type="way">
+        <item name="Address Interpolation" icon="presets/interpolation.png" type="way" preset_name_label="true">
            <link href="http://wiki.openstreetmap.org/wiki/Key:addr"
                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:addr"
@@ -6993,5 +6519,4 @@
                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:addr"
                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:addr" />
-            <label text="Edit Address Interpolation" />
             <space />
             <combo key="addr:interpolation" text="Numbering scheme" values="odd,even,all,alphabetic" default="odd" match="key" />
@@ -7000,6 +6525,5 @@
             </optional>
         </item>
-        <item name="Contact (common schema)" icon="presets/contact.png" type="node,way,closedway,relation">
-            <label text="Edit Contact information" />
+        <item name="Contact (common schema)" icon="presets/contact.png" type="node,way,closedway,relation" preset_name_label="true">
             <space />
             <text key="phone" text="Phone Number" match="key" />
@@ -7012,5 +6536,5 @@
             <text key="image" text="Image" />
         </item>
-        <item name="Contact (schema with 'contact:*' prefix)" icon="presets/contact.png" type="node,way,closedway,relation">
+        <item name="Contact (schema with 'contact:*' prefix)" icon="presets/contact.png" type="node,way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:contact"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:contact"
@@ -7019,5 +6543,4 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:contact"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:contact" />
-            <label text="Edit Contact information (new schema)" />
             <space />
             <text key="contact:phone" text="Phone Number" match="key" />
@@ -7032,5 +6555,5 @@
     </group> <!-- Annotation -->
     <group name="Relations" icon="presets/relations.png">
-        <item name="Multipolygon" icon="presets/multipolygon.png" type="relation">
+        <item name="Multipolygon" icon="presets/multipolygon.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:multipolygon"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Relation:multipolygon"
@@ -7041,5 +6564,4 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:multipolygon"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:multipolygon" />
-            <label text="Edit Multipolygon" />
             <key key="type" value="multipolygon" />
             <optional>
@@ -7051,5 +6573,5 @@
             </roles>
         </item>
-        <item name="Boundary" icon="presets/boundaries.png" type="relation">
+        <item name="Boundary" icon="presets/boundaries.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:boundary"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:boundary"
@@ -7059,5 +6581,4 @@
                   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" />
@@ -7075,8 +6596,7 @@
             </roles>
         </item>
-        <item name="Site" type="relation">
+        <item name="Site" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:site"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:site" />
-            <label text="Edit Site" />
             <space />
             <key key="type" value="site" />
@@ -7090,5 +6610,5 @@
         </item>
         <separator/>
-        <item name="Turn restriction" icon="styles/standard/vehicle/restriction/turn_restrictions/no_u_turn.png" type="relation">
+        <item name="Turn restriction" icon="styles/standard/vehicle/restriction/turn_restrictions/no_u_turn.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"
@@ -7100,5 +6620,4 @@
                   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" />
@@ -7113,5 +6632,5 @@
             </roles>
         </item>
-        <item name="Enforcement" icon="presets/speed_camera.png" type="relation">
+        <item name="Enforcement" icon="presets/speed_camera.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:enforcement"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:enforcement"
@@ -7120,5 +6639,4 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Relation:enforcement"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:enforcement" />
-            <label text="Edit Enforcement" />
             <space />
             <key key="type" value="enforcement" />
@@ -7137,7 +6655,6 @@
 
         <group name="Routes">
-            <item name="Bicycle route" icon="presets/path.png" type="relation">
+            <item name="Bicycle route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=bicycle"/>
-                <label text="Edit bicycle route"/>
                 <space/>
                 <key key="type" value="route"/>
@@ -7153,7 +6670,6 @@
             </item>
 
-            <item name="MTB route" icon="presets/path.png" type="relation">
+            <item name="MTB route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Mountain_biking"/>
-                <label text="Edit MTB route"/>
                 <space/>
                 <key key="type" value="route"/>
@@ -7168,7 +6684,6 @@
             </item>
 
-            <item name="Hiking route" icon="presets/path.png" type="relation">
+            <item name="Hiking route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=hiking#Tagging_walking_and_hiking_Route_Networks"/>
-                <label text="Edit hiking route"/>
                 <space/>
                 <key key="type" value="route"/>
@@ -7186,7 +6701,6 @@
             </item>
 
-            <item name="Piste route" icon="presets/path.png" type="relation">
+            <item name="Piste route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=piste"/>
-                <label text="Edit piste route"/>
                 <space/>
                 <key key="type" value="route"/>
@@ -7208,7 +6722,6 @@
             </item>
 
-            <item name="Ski route" icon="presets/path.png" type="relation">
+            <item name="Ski route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ski"/>
-                <label text="Edit ski route"/>
                 <space/>
                 <key key="type" value="route"/>
@@ -7231,7 +6744,6 @@
 
             <separator/>
-            <item name="Detour route" icon="presets/path.png" type="relation">
+            <item name="Detour route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=detour"/>
-                <label text="Edit detour route"/>
                 <space/>
                 <key key="type" value="route"/>
@@ -7247,6 +6759,5 @@
                 </roles>
             </item>
-            <item name="Power route" icon="presets/path.png" type="relation">
-                <label text="Edit power route"/>
+            <item name="Power route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <space/>
                 <key key="type" value="route"/>
@@ -7257,6 +6768,5 @@
                 </roles>
             </item>
-            <item name="Railway route" icon="presets/path.png" type="relation">
-                <label text="Edit railway route"/>
+            <item name="Railway route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=railway"/>
                 <space/>
@@ -7268,6 +6778,5 @@
                 </roles>
             </item>
-            <item name="Road route" icon="presets/path.png" type="relation">
-                <label text="Edit road route"/>
+            <item name="Road route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=road"/>
                 <space/>
@@ -7285,7 +6794,6 @@
         </group> <!-- Routes -->
 
-        <item name="Route Network" icon="presets/path.png" type="relation">
+        <item name="Route Network" icon="presets/path.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network" />
-            <label text="Edit Route Network" />
             <space />
             <key key="type" value="network" />
@@ -7300,5 +6808,5 @@
         </item>
         <separator/>
-        <item name="Associated Street" icon="presets/addresses.png" type="relation">
+        <item name="Associated Street" icon="presets/addresses.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:associatedStreet"
@@ -7306,5 +6814,4 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:associatedStreet"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Relation:associatedStreet" />
-            <label text="Edit Associated Street" />
             <space />
             <key key="type" value="associatedStreet" />
@@ -7315,8 +6822,7 @@
             </roles>
         </item>
-        <item name="Street" type="relation">
+        <item name="Street" type="relation" preset_name_label="true">
             <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" />
@@ -7329,5 +6835,5 @@
             </roles>
         </item>
-        <item name="Destination sign" icon="presets/guidepost.png" type="relation">
+        <item name="Destination sign" icon="presets/guidepost.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:destination_sign"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:destination_sign"
@@ -7337,5 +6843,4 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:destination_sign"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:destination_sign" />
-            <label text="Edit Destination Sign" />
             <space />
             <key key="type" value="destination_sign" />
@@ -7354,7 +6859,6 @@
         </item>
         <separator/>
-        <item name="Waterway" icon="presets/river.png" type="relation">
+        <item name="Waterway" icon="presets/river.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Waterway" />
-            <label text="Edit Waterway" />
             <space />
             <key key="type" value="waterway" />
@@ -7378,9 +6882,8 @@
             </roles>
         </item>
-        <item name="Bridge" icon="presets/bridge.png" type="relation">
+        <item name="Bridge" icon="presets/bridge.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA: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" />
@@ -7397,7 +6900,6 @@
             </roles>
         </item>
-        <item name="Tunnel" icon="presets/tunnel.png" type="relation">
+        <item name="Tunnel" icon="presets/tunnel.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels" />
-            <label text="Edit Tunnel" />
             <space />
             <key key="type" value="tunnel" />
Index: /trunk/data/tagging-preset.xsd
===================================================================
--- /trunk/data/tagging-preset.xsd	(revision 6823)
+++ /trunk/data/tagging-preset.xsd	(revision 6824)
@@ -74,4 +74,5 @@
 		<attribute name="name_template" type="string"/>
 		<attribute name="name_template_filter" type="string"/>
+		<attribute name="preset_name_label" type="boolean"/>
 
 		<attribute name="text" use="prohibited" />
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 6823)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 6824)
@@ -74,4 +74,5 @@
     public String name_context;
     public String locale_name;
+    public boolean preset_name_label;
     public final static String OPTIONAL_TOOLTIP_TEXT = "Optional tooltip text";
 
@@ -216,4 +217,7 @@
             }
             p.add(pp, GBC.eol());
+        }
+        if (preset_name_label) {
+            TaggingPresetItems.Label.addLabel(p,/*I18n: {0} is preset name */tr("Edit {0}", getName()));
         }
 
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java	(revision 6823)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java	(revision 6824)
@@ -354,6 +354,10 @@
         public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel, boolean presetInitiallyMatches) {
             initializeLocaleText(null);
-            p.add(new JLabel(locale_text), GBC.eol());
+            addLabel(p, locale_text);
             return false;
+        }
+
+        public static void addLabel(JPanel p, String label) {
+            p.add(new JLabel(label), GBC.eol());
         }
     }