Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 5155)
+++ trunk/data/defaultpresets.xml	(revision 5156)
@@ -25,5 +25,5 @@
   key: key to set
   value: value to set
-  match: none/key/key!/keyvalue (default is "ketvalue", see below for more information)
+  match: none/key/key!/keyvalue (default is "keyvalue", see below for more information)
 
 text: text box
@@ -128,16 +128,16 @@
             <space />
             <key key="highway" value="motorway" />
-            <text key="ref" text="Reference" default="" delete_if_empty="true" />
-            <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="2" delete_if_empty="true" />
-                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <check key="oneway" text="Oneway" default="on" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
+            <text key="ref" text="Reference" />
+            <optional>
+                <text key="name" text="Name" />
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="2" />
+                <text key="maxspeed" text="Max. speed (km/h)" />
+                <check key="oneway" text="Oneway" default="on" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
             </optional>
         </item>
@@ -156,13 +156,13 @@
             <key key="highway" value="motorway_link" />
             <optional>
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="2" delete_if_empty="true" />
-                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <check key="oneway" text="Oneway" default="on" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="2" />
+                <text key="maxspeed" text="Max. speed (km/h)" />
+                <check key="oneway" text="Oneway" default="on" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
             </optional>
         </item>
@@ -179,17 +179,17 @@
             <space />
             <key key="highway" value="trunk" />
-            <text key="ref" text="Reference" default="" delete_if_empty="true" />
-            <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="2" delete_if_empty="true" />
-                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <check key="oneway" text="Oneway" default="on" delete_if_empty="true" />
-                <check key="motorroad" text="Motorroad" default="on" delete_if_empty="false" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
+            <text key="ref" text="Reference" />
+            <optional>
+                <text key="name" text="Name" />
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="2" />
+                <text key="maxspeed" text="Max. speed (km/h)" />
+                <check key="oneway" text="Oneway" default="on" />
+                <check key="motorroad" text="Motorroad" default="on" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
             </optional>
         </item>
@@ -205,16 +205,16 @@
             <space />
             <key key="highway" value="trunk_link" />
-            <text key="ref" text="Reference" default="" delete_if_empty="true" />
-            <optional>
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="1" delete_if_empty="true" />
-                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <check key="oneway" text="Oneway" default="on" delete_if_empty="true" />
-                <check key="motorroad" text="Motorroad" default="on" delete_if_empty="false" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
+            <text key="ref" text="Reference" />
+            <optional>
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="1" />
+                <text key="maxspeed" text="Max. speed (km/h)" />
+                <check key="oneway" text="Oneway" default="on" />
+                <check key="motorroad" text="Motorroad" default="on" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
             </optional>
         </item>
@@ -231,18 +231,18 @@
             <space />
             <key key="highway" value="primary" />
-            <text key="ref" text="Reference" default="" delete_if_empty="true" />
-            <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
-                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-                <check key="motorroad" text="Motorroad" default="off" delete_if_empty="false" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
+            <text key="ref" text="Reference" />
+            <optional>
+                <text key="name" text="Name" />
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <combo key="lanes" text="Lanes" values="1,2,3,4,5" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+                <text key="maxspeed" text="Max. speed (km/h)" />
+                <check key="oneway" text="Oneway" default="off" />
+                <check key="motorroad" text="Motorroad" default="off" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
             </optional>
         </item>
@@ -259,15 +259,15 @@
             <key key="highway" value="primary_link" />
             <optional>
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
-                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-                <check key="motorroad" text="Motorroad" default="off" delete_if_empty="false" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <combo key="lanes" text="Lanes" values="1,2,3,4,5" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+                <text key="maxspeed" text="Max. speed (km/h)" />
+                <check key="oneway" text="Oneway" default="off" />
+                <check key="motorroad" text="Motorroad" default="off" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
             </optional>
         </item>
@@ -284,17 +284,17 @@
             <space />
             <key key="highway" value="secondary" />
-            <text key="ref" text="Reference" default="" delete_if_empty="true" />
-            <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
-                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
+            <text key="ref" text="Reference" />
+            <optional>
+                <text key="name" text="Name" />
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <combo key="lanes" text="Lanes" values="1,2,3,4,5" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+                <text key="maxspeed" text="Max. speed (km/h)" />
+                <check key="oneway" text="Oneway" default="off" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
             </optional>
         </item>
@@ -312,17 +312,17 @@
             <space />
             <key key="highway" value="tertiary" />
-            <text key="ref" text="Reference" default="" delete_if_empty="true" />
-            <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
-                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
+            <text key="ref" text="Reference" />
+            <optional>
+                <text key="name" text="Name" />
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <combo key="lanes" text="Lanes" values="1,2,3,4,5" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+                <text key="maxspeed" text="Max. speed (km/h)" />
+                <check key="oneway" text="Oneway" default="off" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
             </optional>
         </item>
@@ -340,18 +340,18 @@
             <key key="highway" value="unclassified" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
-                <check key="passing_places" text="Passing Places" default="off" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" />
-                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
+                <check key="oneway" text="Oneway" default="off" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
+                <check key="passing_places" text="Passing Places" default="off" />
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <combo key="lanes" text="Lanes" values="1,2,3,4,5" />
+                <text key="maxspeed" text="Max. speed (km/h)" />
+                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <text key="width" text="Width (meters)" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
         </item>
@@ -367,18 +367,18 @@
             <space />
             <key key="highway" value="residential" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <optional>
-                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" />
-                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <optional>
+                <check key="oneway" text="Oneway" default="off" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <combo key="lanes" text="Lanes" values="1,2,3,4,5" />
+                <text key="maxspeed" text="Max. speed (km/h)" />
+                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <text key="width" text="Width (meters)" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
         </item>
@@ -393,16 +393,16 @@
             <space />
             <key key="highway" value="living_street" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <optional>
-                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <optional>
+                <check key="oneway" text="Oneway" default="off" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <text key="width" text="Width (meters)" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
         </item>
@@ -419,16 +419,16 @@
             <space />
             <key key="highway" value="pedestrian" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <optional>
-                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <optional>
+                <check key="oneway" text="Oneway" default="off" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <text key="width" text="Width (meters)" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
         </item>
@@ -445,18 +445,18 @@
             <key key="highway" value="service" />
             <optional>
-                <combo key="service" text="Serviceway type" values="alley,driveway,parking_aisle" default="" delete_if_empty="true" />
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
-                <check key="passing_places" text="Passing Places" default="off" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
-                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
+                <combo key="service" text="Serviceway type" values="alley,driveway,parking_aisle" />
+                <text key="name" text="Name" />
+                <check key="oneway" text="Oneway" default="off" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
+                <check key="passing_places" text="Passing Places" default="off" />
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <text key="maxspeed" text="Max. speed (km/h)" />
+                <text key="width" text="Width (meters)" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
         </item>
@@ -474,7 +474,7 @@
             <key key="service" value="parking_aisle" />
             <optional>
-                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
+                <check key="oneway" text="Oneway" default="off" />
+                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <check key="lit" text="Lit" default="off" /> 
             </optional>
         </item>
@@ -490,16 +490,16 @@
             <key key="highway" value="road" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
-                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
+                <check key="oneway" text="Oneway" default="off" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <text key="maxspeed" text="Max. speed (km/h)" />
+                <text key="width" text="Width (meters)" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
         </item>
@@ -515,17 +515,17 @@
             <key key="highway" value="construction" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
-                <combo key="junction" text="Junction" values="roundabout,jughandle,yes" default="" delete_if_empty="true" />
-                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
+                <check key="oneway" text="Oneway" default="off" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <combo key="junction" text="Junction" values="roundabout,jughandle,yes" />
+                <text key="maxspeed" text="Max. speed (km/h)" />
+                <text key="width" text="Width (meters)" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
         </item>
@@ -543,31 +543,31 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:access" />
             <label text="Edit Road Restrictions" />
-            <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-            <check key="toll" text="Toll" default="off" delete_if_empty="true"  />
-            <check key="noexit" text="No exit (cul-de-sac)" default="off" delete_if_empty="true"  />
+            <check key="oneway" text="Oneway" default="off" />
+            <check key="toll" text="Toll" default="off"  />
+            <check key="noexit" text="No exit (cul-de-sac)" default="off"  />
             <label text="Transport mode restrictions" />
-            <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" default="" delete_if_empty="true" />
-            <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" default="" delete_if_empty="true" />
-            <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" default="" delete_if_empty="true" />
+            <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" />
+            <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" />
+            <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" />
             <label text="Vehicles per type" />
-            <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" default="" delete_if_empty="true"  />
-            <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,no" default="" delete_if_empty="true"  />
-            <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" default="" delete_if_empty="true"  />
-            <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" default="" delete_if_empty="true" />
-            <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" default="" delete_if_empty="true" />
-            <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" default="" delete_if_empty="true" />
-            <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" default="" delete_if_empty="true" />
+            <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no"  />
+            <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,no"  />
+            <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no"  />
+            <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
+            <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
+            <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
+            <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
             <label text="Vehicles per use" />
-            <combo key="agricultural" text="Agricultural" values="yes,official,designated,destination,permissive,private,no" default="" delete_if_empty="true" />
-            <combo key="emergency" text="Emergency vehicles"  values="yes,official,designated,destination,permissive,private,no" default="" delete_if_empty="true" />
-            <combo key="hov" text="High-occupancy vehicles (hov)"  values="yes,official,designated,destination,permissive,private,no" default="" delete_if_empty="true" />
-            <combo key="psv" text="Public Service Vehicles (psv)"   values="yes,official,designated,destination,permissive,private,no" default="" delete_if_empty="true" />
-            <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-            <text key="minspeed" text="Min. speed (km/h)" default="" delete_if_empty="true" />
-            <text key="maxweight" text="Max. weight (tonnes)" default="" delete_if_empty="true" />
-            <text key="maxaxleload" text="Max. axleload (tonnes)" default="" delete_if_empty="true" />
-            <text key="maxheight" text="Max. height (meters)" default="" delete_if_empty="true" />
-            <text key="maxwidth" text="Max. width (meters)" default="" delete_if_empty="true" />
-            <text key="maxlength" text="Max. length (meters)" default="" delete_if_empty="true" />
+            <combo key="agricultural" text="Agricultural" values="yes,official,designated,destination,permissive,private,no" />
+            <combo key="emergency" text="Emergency vehicles"  values="yes,official,designated,destination,permissive,private,no" />
+            <combo key="hov" text="High-occupancy vehicles (hov)"  values="yes,official,designated,destination,permissive,private,no" />
+            <combo key="psv" text="Public Service Vehicles (psv)"   values="yes,official,designated,destination,permissive,private,no" />
+            <text key="maxspeed" text="Max. speed (km/h)" />
+            <text key="minspeed" text="Min. speed (km/h)" />
+            <text key="maxweight" text="Max. weight (tonnes)" />
+            <text key="maxaxleload" text="Max. axleload (tonnes)" />
+            <text key="maxheight" text="Max. height (meters)" />
+            <text key="maxwidth" text="Max. width (meters)" />
+            <text key="maxlength" text="Max. length (meters)" />
         </item>
         <separator/>
@@ -584,16 +584,16 @@
             <space />
             <key key="junction" value="roundabout" />
-            <combo key="highway" text="Type" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" delete_if_empty="true" />
-            <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
+            <combo key="highway" text="Type" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" />
+            <optional>
+                <text key="name" text="Name" />
+                <check key="oneway" text="Oneway" default="off" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <combo key="lanes" text="Lanes" values="1,2,3,4,5" />
+                <text key="width" text="Width (meters)" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
         </item>
@@ -612,10 +612,10 @@
             <combo key="bridge" text="Bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="1" delete_if_empty="true" />
-                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <text key="maxweight" text="Max. weight (tonnes)" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="1" />
+                <text key="maxspeed" text="Max. speed (km/h)" />
+                <text key="maxweight" text="Max. weight (tonnes)" />
+                <text key="width" text="Width (meters)" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
         </item>
@@ -633,9 +633,9 @@
             <key key="tunnel" value="yes" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" delete_if_empty="true" />
-                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" />
+                <text key="maxspeed" text="Max. speed (km/h)" />
+                <text key="width" text="Width (meters)" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
         </item>
@@ -646,6 +646,6 @@
             <key key="ford" value="yes" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
         </item>
@@ -667,21 +667,21 @@
             <key key="highway" value="track" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <combo key="tracktype" text="Tracktype" values="grade1,grade2,grade3,grade4,grade5" default="" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="paved,concrete,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
-                <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" default="" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
-                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="access" text="General access" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" default="" delete_if_empty="true" />
-                <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" default="" delete_if_empty="true" />
-                <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" default="" delete_if_empty="true" />
-                <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
+                <combo key="tracktype" text="Tracktype" values="grade1,grade2,grade3,grade4,grade5" />
+                <combo key="surface" text="Surface" values="paved,concrete,cobblestone,gravel,ground,grass,sand" />
+                <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
+                <check key="oneway" text="Oneway" default="off" />
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <combo key="access" text="General access" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
+                <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
+                <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
+                <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
+                <text key="width" text="Width (meters)" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
         </item>
@@ -699,6 +699,6 @@
             <key key="highway" value="path" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <combo key="sac_scale" text="SAC Scale" values="hiking,mountain_hiking,demanding_mountain_hiking,alpine_hiking,demanding_alpine_hiking,difficult_alpine_hiking" default="" delete_if_empty="true" display_values="T1 - hiking trail,T2 - mountain hiking trail,T3 - difficult\, exposed hiking trail,T4 - difficult\, exposed\, steep alpine trail,T5 - difficult alpine trail with climbing,T6 - hazardous alpine trail with climbing">
+                <text key="name" text="Name" />
+                <combo key="sac_scale" text="SAC Scale" values="hiking,mountain_hiking,demanding_mountain_hiking,alpine_hiking,demanding_alpine_hiking,difficult_alpine_hiking" display_values="T1 - hiking trail,T2 - mountain hiking trail,T3 - difficult\, exposed hiking trail,T4 - difficult\, exposed\, steep alpine trail,T5 - difficult alpine trail with climbing,T6 - hazardous alpine trail with climbing">
                     <short_description>Trail well cleared. Area flat or slightly sloped, no fall hazard</short_description>
                     <short_description>Trail with continuous line and balanced ascent. Terrain partially steep, fall hazard possible</short_description>
@@ -708,24 +708,24 @@
                     <short_description>climbing up to second grade. Often very exposed, precarious jagged rocks, glacier with danger to slip and fall</short_description>
                 </combo>
-                <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" default="" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
-                <combo key="trail_visibility" text="Visibility" values="excellent,good,intermediate,bad,horrible,no" default="" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
-                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-                <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" default="" delete_if_empty="true" />
-                <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,no" default="" delete_if_empty="true" />
-                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" default="" delete_if_empty="true" />
-                <combo key="wheelchair" text="Wheelchairs" values="unknown,yes,official,no" default="" delete_if_empty="true" />
-                <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" default="" delete_if_empty="true" />
-                <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,private,no" default="" delete_if_empty="true" />
-                <!-- <combo key="motorcar" text="Motorcar" values="yes,designated,no" default="no" delete_if_empty="true" /> -->
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
+                <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
+                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <combo key="trail_visibility" text="Visibility" values="excellent,good,intermediate,bad,horrible,no" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
+                <check key="oneway" text="Oneway" default="off" />
+                <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" />
+                <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,no" />
+                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" />
+                <combo key="wheelchair" text="Wheelchairs" values="unknown,yes,official,no" />
+                <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" />
+                <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,private,no" />
+                <!-- <combo key="motorcar" text="Motorcar" values="yes,designated,no" default="no" /> -->
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <text key="maxspeed" text="Max. speed (km/h)" />
+                <text key="width" text="Width (meters)" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
         </item>
@@ -741,16 +741,16 @@
             <key key="highway" value="bridleway" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
-                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
+                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <check key="oneway" text="Oneway" default="off" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <text key="maxspeed" text="Max. speed (km/h)" />
+                <text key="width" text="Width (meters)" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
         </item>
@@ -764,12 +764,12 @@
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Bicycle" />
             <label text="Edit Cycle Lane" />
-            <combo key="cycleway" text="Cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" default="" delete_if_empty="true" />
-            <combo key="cycleway:left" text="Cycleway left" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" default="" delete_if_empty="true" />
-            <combo key="cycleway:right" text="Cycleway right" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" default="" delete_if_empty="true" />
-            <check key="oneway:bicycle" text="Oneway (bicycle)" default="off" delete_if_empty="true" />
+            <combo key="cycleway" text="Cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" />
+            <combo key="cycleway:left" text="Cycleway left" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" />
+            <combo key="cycleway:right" text="Cycleway right" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" />
+            <check key="oneway:bicycle" text="Oneway (bicycle)" default="off" />
             <space />
             <label text="Edit Highway" />
-            <combo key="highway" text="Highway" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" delete_if_empty="true" />
-            <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
+            <combo key="highway" text="Highway" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" />
+            <check key="oneway" text="Oneway" default="off" />
         </item>
         <item name="Dedicated Cycleway" icon="presets/cycleway.png" type="way">
@@ -785,16 +785,16 @@
             <key key="highway" value="cycleway" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
-                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
-                <combo key="foot" text="Pedestrians" values="unknown,yes,no" default="" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
+                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <check key="oneway" text="Oneway" default="off" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
+                <combo key="foot" text="Pedestrians" values="unknown,yes,no" />
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <text key="width" text="Width (meters)" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
         </item>
@@ -810,15 +810,15 @@
             <key key="segregated" value="yes" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
-                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
+                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <check key="oneway" text="Oneway" default="off" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <text key="width" text="Width (meters)" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
         </item>
@@ -834,16 +834,16 @@
             <key key="segregated" value="no" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
-                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
-                <check key="passing_places" text="Passing Places" default="off" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
+                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <check key="oneway" text="Oneway" default="off" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
+                <check key="passing_places" text="Passing Places" default="off" />
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <text key="width" text="Width (meters)" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
         </item>
@@ -860,15 +860,15 @@
             <key key="highway" value="footway" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
-                <check key="passing_places" text="Passing Places" default="off" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
+                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
+                <check key="passing_places" text="Passing Places" default="off" />
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <text key="width" text="Width (meters)" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
         </item>
@@ -885,15 +885,15 @@
             <key key="highway" value="steps" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
-                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <check key="lit" text="Lit" default="off" delete_if_empty="true" /> 
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-                <text key="step_count" text="Amount of Steps" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
+                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <check key="oneway" text="Oneway" default="off" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <check key="lit" text="Lit" default="off" /> 
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <text key="width" text="Width (meters)" />
+                <text key="step_count" text="Amount of Steps" />
             </optional>
         </item>
@@ -909,7 +909,7 @@
             <space />
             <key key="highway" value="motorway_junction" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ref" text="Number" default="" delete_if_empty="true" />
-            <text key="exit_to" text="Exit to" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Number" />
+            <text key="exit_to" text="Exit to" />
         </item>
         <item name="Services" icon="styles/standard/vehicle/services.png" type="node,closedway,relation">
@@ -924,7 +924,7 @@
             <key key="highway" value="services" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <text key="operator" text="Operator" default="" delete_if_empty="true" />
-                <check key="toilets" text="Toilets" default="off" delete_if_empty="true" />
+                <text key="name" text="Name" />
+                <text key="operator" text="Operator" />
+                <check key="toilets" text="Toilets" default="off" />
             </optional>
         </item>
@@ -941,6 +941,6 @@
             <key key="highway" value="rest_area" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <check key="toilets" text="Toilets" default="off" delete_if_empty="true" />
+                <text key="name" text="Name" />
+                <check key="toilets" text="Toilets" default="off" />
             </optional>
         </item>
@@ -958,9 +958,9 @@
             <key key="highway" value="traffic_signals" />
             <optional>
-                 <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" default="" delete_if_empty="true" />
-                 <check key="horse" text="Cross on horseback" default="off" delete_if_empty="true" />
-                 <check key="bicycle" text="Cross by bicycle" default="off" delete_if_empty="true" />
-                 <check key="supervised" text="Crossing attendant" default="off" delete_if_empty="true" />
-                 <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" default="" delete_if_empty="true" />
+                 <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
+                 <check key="horse" text="Cross on horseback" default="off" />
+                 <check key="bicycle" text="Cross by bicycle" default="off" />
+                 <check key="supervised" text="Crossing attendant" default="off" />
+                 <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
             </optional>
         </item>
@@ -976,5 +976,5 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=mini_roundabout" />
             <key key="highway" value="mini_roundabout" />
-            <combo key="direction" text="Direction" values="clockwise" default="" delete_if_empty="true" />
+            <combo key="direction" text="Direction" values="clockwise" />
         </item>
         <item name="Pedestrian Crossing" icon="styles/standard/vehicle/zebra_crossing.png" type="node">
@@ -988,9 +988,9 @@
             <label text="Edit Crossing" />
             <key key="highway" value="crossing" />
-            <combo key="crossing" text="Type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" default="" delete_if_empty="true" />
-            <check key="bicycle" text="Cross by bicycle" default="off" delete_if_empty="true" />
-            <check key="horse" text="Cross on horseback" default="off" delete_if_empty="true" />
-            <check key="supervised" text="Crossing attendant" default="off" delete_if_empty="true" />
-            <combo key="crossing_ref" text="Type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" default="" delete_if_empty="true" />
+            <combo key="crossing" text="Type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
+            <check key="bicycle" text="Cross by bicycle" default="off" />
+            <check key="horse" text="Cross on horseback" default="off" />
+            <check key="supervised" text="Crossing attendant" default="off" />
+            <combo key="crossing_ref" text="Type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
         </item>
         <item name="Traffic Calming" icon="presets/chicane.png" type="node">
@@ -1002,5 +1002,5 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:traffic_calming"/>
             <label text="Edit Traffic Calming" />
-            <combo key="traffic_calming" text="Type" values="yes,bump,chicane,choker,cushion,hump,table" default="" delete_if_empty="true" />
+            <combo key="traffic_calming" text="Type" values="yes,bump,chicane,choker,cushion,hump,table" />
         </item>
         <item name="Passing Place" icon="presets/passingplace.png" type="node">
@@ -1025,6 +1025,6 @@
             <key key="traffic_sign" value="city_limit" />
             <space />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="alt_name" text="Second Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="alt_name" text="Second Name" />
         </item>
         <item name="Speed Camera" icon="presets/speed_camera.png" type="node">
@@ -1053,7 +1053,7 @@
             <key key="mountain_pass" value="yes" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <text key="ele" text="Elevation" default="" delete_if_empty="true" />
-                <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
+                <text key="ele" text="Elevation" />
+                <text key="wikipedia" text="Wikipedia" />
             </optional>
         </item>
@@ -1074,8 +1074,8 @@
             <label text="Allowed traffic:" />
             <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
-            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
-            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
+            <check key="foot" text="Foot" default="on" />
+            <check key="bicycle" text="Bicycle" default="on" />
+            <check key="horse" text="Horse" default="off" />
+            <check key="motorcycle" text="Motorcycle" default="off" />
         </item> <!-- bollard -->
         <item name="Cycle Barrier" icon="styles/standard/vehicle/cycle_barrier.png" type="node">
@@ -1084,8 +1084,8 @@
             <label text="Allowed traffic:" />
             <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
-            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
-            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
+            <check key="foot" text="Foot" default="on" />
+            <check key="bicycle" text="Bicycle" default="on" />
+            <check key="horse" text="Horse" default="off" />
+            <check key="motorcycle" text="Motorcycle" default="off" />
         </item> <!-- cycle_barrier -->
         <item name="Block" icon="presets/block.png" type="node,way,closedway">
@@ -1093,8 +1093,8 @@
             <label text="Allowed traffic:" />
             <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
-            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
-            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
+            <check key="foot" text="Foot" default="on" />
+            <check key="bicycle" text="Bicycle" default="on" />
+            <check key="horse" text="Horse" default="off" />
+            <check key="motorcycle" text="Motorcycle" default="off" />
         </item> <!-- block -->
         <item name="Cattle Grid" icon="presets/cattle_grid.png" type="node">
@@ -1105,8 +1105,8 @@
             <label text="Allowed traffic:" />
             <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
-            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
-            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
+            <check key="foot" text="Foot" default="on" />
+            <check key="bicycle" text="Bicycle" default="on" />
+            <check key="motorcycle" text="Motorcycle" default="off" />
+            <check key="motorcar" text="Motorcar" default="off" />
         </item> <!-- cattle_grid -->
         <item name="Bus Trap" icon="presets/empty.png" type="node">
@@ -1119,9 +1119,9 @@
             <label text="Allowed traffic:" />
             <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
-            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
-            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
-            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
+            <check key="foot" text="Foot" default="on" />
+            <check key="bicycle" text="Bicycle" default="on" />
+            <check key="horse" text="Horse" default="off" />
+            <check key="motorcycle" text="Motorcycle" default="off" />
+            <check key="motorcar" text="Motorcar" default="off" />
         </item> <!-- spikes -->
         <item name="Toll Booth" icon="presets/toll_station.png" type="node,closedway">
@@ -1136,6 +1136,6 @@
             <key key="barrier" value="toll_booth" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <text key="operator" text="Operator" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
+                <text key="operator" text="Operator" />
             </optional>
         </item> <!-- toll_booth -->
@@ -1146,9 +1146,9 @@
             <label text="Allowed traffic:" />
             <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
-            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
-            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
-            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
+            <check key="foot" text="Foot" default="on" />
+            <check key="bicycle" text="Bicycle" default="on" />
+            <check key="horse" text="Horse" default="off" />
+            <check key="motorcycle" text="Motorcycle" default="off" />
+            <check key="motorcar" text="Motorcar" default="off" />
         </item> <!-- border_control -->
         <separator/>
@@ -1175,5 +1175,5 @@
             <key key="barrier" value="fence" />
             <optional>
-                <combo key="fence_type" text="Type" values="barbed_wire,chain,electric,hedge,pole,split_rail,wood" default="" delete_if_empty="true" />
+                <combo key="fence_type" text="Type" values="barbed_wire,chain,electric,hedge,pole,split_rail,wood" />
             </optional>
         </item> <!-- fence -->
@@ -1204,9 +1204,9 @@
             <label text="Allowed traffic:" />
             <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
-            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
-            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
-            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
+            <check key="foot" text="Foot" default="on" />
+            <check key="bicycle" text="Bicycle" default="on" />
+            <check key="horse" text="Horse" default="off" />
+            <check key="motorcycle" text="Motorcycle" default="off" />
+            <check key="motorcar" text="Motorcar" default="off" />
         </item> <!-- entrance -->
         <item name="Gate" icon="presets/gate.png" type="node">
@@ -1221,9 +1221,9 @@
             <label text="Allowed traffic:" />
             <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
-            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
-            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
-            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
+            <check key="foot" text="Foot" default="on" />
+            <check key="bicycle" text="Bicycle" default="on" />
+            <check key="horse" text="Horse" default="off" />
+            <check key="motorcycle" text="Motorcycle" default="off" />
+            <check key="motorcar" text="Motorcar" default="off" />
         </item> <!-- gate -->
         <item name="Lift Gate" icon="presets/lift_gate.png" type="node">
@@ -1233,9 +1233,9 @@
             <label text="Allowed traffic:" />
             <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
-            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
-            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
-            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
+            <check key="foot" text="Foot" default="on" />
+            <check key="bicycle" text="Bicycle" default="on" />
+            <check key="horse" text="Horse" default="off" />
+            <check key="motorcycle" text="Motorcycle" default="off" />
+            <check key="motorcar" text="Motorcar" default="off" />
         </item> <!-- lift_gate -->
         <item name="Hampshire Gate" icon="presets/empty.png" type="node">
@@ -1245,9 +1245,9 @@
             <label text="Allowed traffic:" />
             <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
-            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
-            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
-            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
+            <check key="foot" text="Foot" default="on" />
+            <check key="bicycle" text="Bicycle" default="on" />
+            <check key="horse" text="Horse" default="off" />
+            <check key="motorcycle" text="Motorcycle" default="off" />
+            <check key="motorcar" text="Motorcar" default="off" />
         </item> <!-- hampshire_gate -->
         <item name="Bump Gate" icon="presets/empty.png" type="node">
@@ -1257,9 +1257,9 @@
             <label text="Allowed traffic:" />
             <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
-            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
-            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
-            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
+            <check key="foot" text="Foot" default="on" />
+            <check key="bicycle" text="Bicycle" default="on" />
+            <check key="horse" text="Horse" default="off" />
+            <check key="motorcycle" text="Motorcycle" default="off" />
+            <check key="motorcar" text="Motorcar" default="off" />
         </item> <!-- bump_gate -->
         <item name="Kissing Gate" icon="presets/empty.png" type="node">
@@ -1269,6 +1269,6 @@
             <label text="Allowed traffic:" />
             <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
+            <check key="foot" text="Foot" default="on" />
+            <check key="bicycle" text="Bicycle" default="off" />
         </item> <!-- kissing_gate -->
         <item name="Stile" icon="presets/stile.png" type="node">
@@ -1279,6 +1279,6 @@
             <label text="Allowed traffic:" />
             <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
+            <check key="foot" text="Foot" default="on" />
+            <check key="bicycle" text="Bicycle" default="off" />
         </item> <!-- stile -->
         <item name="Turnstile" icon="styles/standard/vehicle/turnstile.png" type="node">
@@ -1288,6 +1288,6 @@
             <label text="Allowed traffic:" />
             <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
+            <check key="foot" text="Foot" default="on" />
+            <check key="bicycle" text="Bicycle" default="off" />
         </item> <!-- turnstile -->
         <item name="Sally Port" icon="styles/standard/vehicle/sally_port.png" type="node">
@@ -1297,9 +1297,9 @@
             <label text="Allowed traffic:" />
             <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
-            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
-            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
-            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
+            <check key="foot" text="Foot" default="on" />
+            <check key="bicycle" text="Bicycle" default="on" />
+            <check key="horse" text="Horse" default="off" />
+            <check key="motorcycle" text="Motorcycle" default="off" />
+            <check key="motorcar" text="Motorcar" default="off" />
         </item> <!-- sally_port -->
 
@@ -1317,6 +1317,6 @@
             <space />
             <key key="waterway" value="drain" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
         </item>
         <item name="Ditch" icon="presets/waterway.png" type="way">
@@ -1328,6 +1328,6 @@
             <space />
             <key key="waterway" value="ditch" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
         </item>
         <item name="Stream" icon="presets/waterway.png" type="way">
@@ -1341,6 +1341,6 @@
             <space />
             <key key="waterway" value="stream" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
         </item>
         <item name="Canal" icon="presets/waterway.png" type="way">
@@ -1352,7 +1352,7 @@
             <space />
             <key key="waterway" value="canal" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+            <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="River" icon="presets/river.png" type="way">
@@ -1366,7 +1366,7 @@
             <space />
             <key key="waterway" value="river" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+            <text key="wikipedia" text="Wikipedia" />
         </item>
         <separator/>
@@ -1377,5 +1377,5 @@
             <label text="Edit Spring" />
             <key key="natural" value="spring" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Waterfall" icon="presets/waterfall.png" type="node,way">
@@ -1383,6 +1383,6 @@
             <space />
             <key key="waterway" value="waterfall" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="Weir" icon="presets/weir.png" type="node,way">
@@ -1395,5 +1395,5 @@
             <space />
             <key key="waterway" value="weir" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Dam" icon="presets/dam.png" type="node,way,closedway">
@@ -1405,6 +1405,6 @@
             <space />
             <key key="waterway" value="dam" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="wikipedia" text="Wikipedia" />
         </item>
          <item name="Groyne" icon="presets/groyne.png" type="node,way,closedway">
@@ -1422,5 +1422,5 @@
             <space />
             <key key="landuse" value="basin" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Reservoir" icon="presets/landuse_water.png" type="node,closedway,relation">
@@ -1430,10 +1430,10 @@
             <space />
             <key key="landuse" value="reservoir" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Covered Reservoir" icon="presets/reservoir_covered.png" type="node,closedway,relation">
             <label text="Edit Covered Reservoir" />
             <key key="man_made" value="reservoir_covered" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <separator/>
@@ -1446,10 +1446,10 @@
             <label text="Edit Water" />
             <key key="natural" value="water" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Land" icon="presets/landuse.png" type="node,closedway,relation">
             <label text="Edit Land" />
             <key key="natural" value="land" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Coastline" icon="presets/coastline.png" type="node,way,closedway,relation">
@@ -1460,5 +1460,5 @@
             <label text="Edit Coastline" />
             <key key="natural" value="coastline" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Riverbank" icon="presets/waterway.png" type="closedway,relation">
@@ -1471,5 +1471,5 @@
             <label text="Edit Riverbank" />
             <key key="waterway" value="riverbank" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <separator/>
@@ -1486,11 +1486,11 @@
             <label text="Edit Wetland" />
             <key key="natural" value="wetland" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove" />
         </item>
         <item name="Mud" icon="presets/mud.png" type="node,closedway,relation">
             <label text="Edit Mud" />
             <key key="natural" value="mud" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Beach" icon="presets/beach.png" type="node,closedway,relation">
@@ -1501,10 +1501,10 @@
             <label text="Edit Beach" />
             <key key="natural" value="beach" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Bay" icon="presets/bay.png" type="node,closedway,relation">
             <label text="Edit Bay" />
             <key key="natural" value="bay" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Cliff" icon="presets/cliff.png" type="node,way,closedway,relation">
@@ -1516,5 +1516,5 @@
             <label text="Edit Cliff" />
             <key key="natural" value="cliff" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
       </group> <!-- Water -->
@@ -1528,6 +1528,6 @@
             <label text="Edit Ferry Terminal" />
             <key key="amenity" value="ferry_terminal" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="cargo" text="Cargo" values="passengers,vehicle,bicycle,hgv,passengers;vehicle" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="cargo" text="Cargo" values="passengers,vehicle,bicycle,hgv,passengers;vehicle" />
         </item>
         <item name="Ferry Route" icon="presets/ferry.png" type="way,closedway">
@@ -1540,5 +1540,5 @@
             <key key="route" value="ferry" />
             <optional>
-              <text key="name" text="Name" default="" delete_if_empty="true" />
+              <text key="name" text="Name" />
             </optional>
         </item>
@@ -1547,5 +1547,5 @@
             <label text="Edit Marina" />
             <key key="leisure" value="marina" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Pier" icon="presets/pier.png" type="way,closedway">
@@ -1557,5 +1557,5 @@
             <label text="Edit Pier" />
             <key key="man_made" value="pier" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Lock Gate" icon="presets/lock_gate.png" type="node">
@@ -1580,5 +1580,5 @@
             <label text="Edit Slipway" />
             <key key="leisure" value="slipway" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Boatyard" icon="presets/boatyard.png" type="node,closedway">
@@ -1588,5 +1588,5 @@
             <space />
             <key key="waterway" value="boatyard" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Dock" icon="presets/boatyard.png" type="node,closedway">
@@ -1597,5 +1597,5 @@
             <space />
             <key key="waterway" value="dock" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
     </group> <!-- Shipping -->
@@ -1613,9 +1613,9 @@
             <key key="railway" value="rail" />
             <optional>
-                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" default="" delete_if_empty="true" />
-                <combo key="service" text="Types" values="yard,siding,spur" default="" delete_if_empty="true" />
-                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" default="" delete_if_empty="true" />
-                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" default="" delete_if_empty="true" />
-                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" default="" delete_if_empty="true" />
+                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" />
+                <combo key="service" text="Types" values="yard,siding,spur" />
+                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
+                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" />
+                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" />
             </optional>
         </item>
@@ -1625,9 +1625,9 @@
             <key key="railway" value="narrow_gauge" />
             <optional>
-                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" default="" delete_if_empty="true" />
-                <combo key="service" text="Types" values="yard,siding,spur" default="" delete_if_empty="true" />
-                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" default="" delete_if_empty="true" />
-                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" default="" delete_if_empty="true" />
-                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" default="" delete_if_empty="true" />
+                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" />
+                <combo key="service" text="Types" values="yard,siding,spur" />
+                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
+                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" />
+                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" />
             </optional>
         </item>
@@ -1640,8 +1640,8 @@
             <key key="railway" value="monorail" />
             <optional>
-                <combo key="service" text="Types" values="yard,siding,spur" default="" delete_if_empty="true" />
-                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" default="" delete_if_empty="true" />
-                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" default="" delete_if_empty="true" />
-                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" default="" delete_if_empty="true" />
+                <combo key="service" text="Types" values="yard,siding,spur" />
+                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
+                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" />
+                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" />
             </optional>
         </item>
@@ -1651,9 +1651,9 @@
             <key key="railway" value="preserved" />
             <optional>
-                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" default="" delete_if_empty="true" />
-                <combo key="service" text="Types" values="yard,siding,spur" default="" delete_if_empty="true" />
-                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" default="" delete_if_empty="true" />
-                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" default="" delete_if_empty="true" />
-                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" default="" delete_if_empty="true" />
+                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" />
+                <combo key="service" text="Types" values="yard,siding,spur" />
+                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
+                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" />
+                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" />
             </optional>
         </item>
@@ -1663,9 +1663,9 @@
             <key key="railway" value="light_rail" />
             <optional>
-                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" default="" delete_if_empty="true" />
-                <combo key="service" text="Types" values="yard,siding,spur" default="" delete_if_empty="true" />
-                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" default="" delete_if_empty="true" />
-                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" default="" delete_if_empty="true" />
-                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" default="" delete_if_empty="true" />
+                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" />
+                <combo key="service" text="Types" values="yard,siding,spur" />
+                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
+                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" />
+                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" />
             </optional>
         </item>
@@ -1675,9 +1675,9 @@
             <key key="railway" value="subway" />
             <optional>
-                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" default="" delete_if_empty="true" />
-                <combo key="service" text="Types" values="yard,siding,spur" default="" delete_if_empty="true" />
-                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" default="" delete_if_empty="true" />
-                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" default="" delete_if_empty="true" />
-                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" default="" delete_if_empty="true" />
+                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" />
+                <combo key="service" text="Types" values="yard,siding,spur" />
+                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
+                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" />
+                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" />
             </optional>
         </item>
@@ -1687,9 +1687,9 @@
             <key key="railway" value="tram" />
             <optional>
-                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" default="" delete_if_empty="true" />
-                <combo key="service" text="Types" values="yard,siding,spur" default="" delete_if_empty="true" />
-                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" default="" delete_if_empty="true" />
-                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" default="" delete_if_empty="true" />
-                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" default="" delete_if_empty="true" />
+                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" />
+                <combo key="service" text="Types" values="yard,siding,spur" />
+                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
+                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" />
+                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" />
             </optional>
         </item>
@@ -1702,15 +1702,15 @@
             <key key="highway" value="bus_guideway" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
-                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
+                <check key="oneway" text="Oneway" default="off" />
+                <check key="bridge" text="Bridge" default="off" />
+                <check key="tunnel" text="Tunnel" default="off" />
+                <check key="cutting" text="Cutting" default="off" />
+                <check key="embankment" text="Embankment" default="off" />
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+                <text key="maxspeed" text="Max. speed (km/h)" />
+                <text key="width" text="Width (meters)" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
         </item>
@@ -1720,5 +1720,5 @@
             <space />
             <key key="railway" value="disused" />
-            <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
+            <combo key="service" text="Optional Types" values="yard,siding,spur" />
         </item>
         <item name="Abandoned Rail" icon="presets/railway.png" type="way">
@@ -1743,8 +1743,8 @@
             <key key="railway" value="crossing" />
             <optional>
-                 <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" default="" delete_if_empty="true" />
-                 <check key="horse" text="Cross on horseback" default="off" delete_if_empty="true" />
-                 <check key="bicycle" text="Cross by bicycle" default="off" delete_if_empty="true" />
-                 <check key="supervised" text="Crossing attendant" default="off" delete_if_empty="true" />
+                 <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
+                 <check key="horse" text="Cross on horseback" default="off" />
+                 <check key="bicycle" text="Cross by bicycle" default="off" />
+                 <check key="supervised" text="Crossing attendant" default="off" />
             </optional>
         </item>
@@ -1766,12 +1766,12 @@
             <label text="Edit Chair Lift" />
             <key key="aerialway" value="chair_lift" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
-            <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" default="" delete_if_empty="true" />
-                <text key="aerialway:occupancy" text="Number of people per chair" default="" delete_if_empty="true" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
-                <check key="aerialway:bubble" text="Has bubble?" default="off" delete_if_empty="true" />
-                <check key="aerialway:heating" text="Has heating?" default="off" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference number" />
+            <optional>
+                <text key="aerialway:capacity" text="Number of people per hour" />
+                <text key="aerialway:occupancy" text="Number of people per chair" />
+                <text key="aerialway:duration" text="Typical journey time in minutes" />
+                <check key="aerialway:bubble" text="Has bubble?" default="off" />
+                <check key="aerialway:heating" text="Has heating?" default="off" />
             </optional>
         </item>
@@ -1780,9 +1780,9 @@
             <label text="Edit Drag Lift" />
             <key key="aerialway" value="drag_lift" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
-            <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" default="" delete_if_empty="true" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference number" />
+            <optional>
+                <text key="aerialway:capacity" text="Number of people per hour" />
+                <text key="aerialway:duration" text="Typical journey time in minutes" />
             </optional>
         </item>
@@ -1792,11 +1792,11 @@
             <label text="Edit Cable Car" />
             <key key="aerialway" value="cable_car" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
-            <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" default="" delete_if_empty="true" />
-                <text key="aerialway:occupancy" text="Number of people per car" default="" delete_if_empty="true" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
-                <check key="aerialway:heating" text="Has heating?" default="off" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference number" />
+            <optional>
+                <text key="aerialway:capacity" text="Number of people per hour" />
+                <text key="aerialway:occupancy" text="Number of people per car" />
+                <text key="aerialway:duration" text="Typical journey time in minutes" />
+                <check key="aerialway:heating" text="Has heating?" default="off" />
             </optional>
         </item>
@@ -1808,11 +1808,11 @@
             <label text="Edit Gondola" />
             <key key="aerialway" value="gondola" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
-            <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" default="" delete_if_empty="true" />
-                <text key="aerialway:occupancy" text="Number of people per gondola" default="" delete_if_empty="true" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
-                <check key="aerialway:heating" text="Has heating?" default="off" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference number" />
+            <optional>
+                <text key="aerialway:capacity" text="Number of people per hour" />
+                <text key="aerialway:occupancy" text="Number of people per gondola" />
+                <text key="aerialway:duration" text="Typical journey time in minutes" />
+                <check key="aerialway:heating" text="Has heating?" default="off" />
             </optional>
         </item>
@@ -1824,12 +1824,12 @@
             <label text="Edit Mixed Lift (containing both gondolas and chairs)" />
             <key key="aerialway" value="mixed_lift" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
-            <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" default="" delete_if_empty="true" />
-                <text key="aerialway:occupancy" text="Number of people per gondola/chair" default="" delete_if_empty="true" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
-                <check key="aerialway:bubble" text="Has bubble?" default="off" delete_if_empty="true" />
-                <check key="aerialway:heating" text="Has heating?" default="off" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference number" />
+            <optional>
+                <text key="aerialway:capacity" text="Number of people per hour" />
+                <text key="aerialway:occupancy" text="Number of people per gondola/chair" />
+                <text key="aerialway:duration" text="Typical journey time in minutes" />
+                <check key="aerialway:bubble" text="Has bubble?" default="off" />
+                <check key="aerialway:heating" text="Has heating?" default="off" />
             </optional>
         </item>
@@ -1838,9 +1838,9 @@
             <label text="Edit T-bar Lift" />
             <key key="aerialway" value="t-bar" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
-            <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" default="" delete_if_empty="true" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference number" />
+            <optional>
+                <text key="aerialway:capacity" text="Number of people per hour" />
+                <text key="aerialway:duration" text="Typical journey time in minutes" />
             </optional>
         </item>
@@ -1849,9 +1849,9 @@
             <label text="Edit J-bar Lift" />
             <key key="aerialway" value="j-bar" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
-            <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" default="" delete_if_empty="true" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference number" />
+            <optional>
+                <text key="aerialway:capacity" text="Number of people per hour" />
+                <text key="aerialway:duration" text="Typical journey time in minutes" />
             </optional>
         </item>
@@ -1860,9 +1860,9 @@
             <label text="Edit Platter Lift" />
             <key key="aerialway" value="platter" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
-            <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" default="" delete_if_empty="true" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference number" />
+            <optional>
+                <text key="aerialway:capacity" text="Number of people per hour" />
+                <text key="aerialway:duration" text="Typical journey time in minutes" />
             </optional>
         </item>
@@ -1871,9 +1871,9 @@
             <label text="Edit Rope Tow" />
             <key key="aerialway" value="rope_tow" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
-            <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" default="" delete_if_empty="true" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference number" />
+            <optional>
+                <text key="aerialway:capacity" text="Number of people per hour" />
+                <text key="aerialway:duration" text="Typical journey time in minutes" />
             </optional>
         </item>
@@ -1882,9 +1882,9 @@
             <label text="Edit Magic Carpet" />
             <key key="aerialway" value="magic_carpet" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
-            <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" default="" delete_if_empty="true" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference number" />
+            <optional>
+                <text key="aerialway:capacity" text="Number of people per hour" />
+                <text key="aerialway:duration" text="Typical journey time in minutes" />
             </optional>
         </item>
@@ -1892,8 +1892,8 @@
             <label text="Edit Goods" text_context="aerialway" />
             <key key="aerialway" value="goods" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
-            <optional>
-                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference number" />
+            <optional>
+                <text key="aerialway:duration" text="Typical journey time in minutes" />
             </optional>
         </item>
@@ -1903,5 +1903,5 @@
             <label text="Edit Station" text_context="aerialway" />
             <key key="aerialway" value="station" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Pylon" name_context="aerialway" icon="presets/power_tower.png" type="node">
@@ -1909,5 +1909,5 @@
             <label text="Edit Pylon" text_context="aerialway" />
             <key key="aerialway" value="pylon" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
     </group> <!-- Aerialway -->
@@ -1925,17 +1925,17 @@
             <label text="Edit Parking" />
             <key key="amenity" value="parking" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
-            <combo key="parking" text="Type" values="multi-storey,surface,underground" default="surface" delete_if_empty="true" />
-            <text key="maxheight" text="Max. height (meters)" default="" delete_if_empty="true" />
-            <combo key="access" text="Access" values="yes,private,customers,permissive,no" default="" delete_if_empty="true" />
-            <combo key="park_ride" text="Park and Ride" values="yes,no" default="" delete_if_empty="true" />
-            <combo key="fee" text="Fee" values="yes,no" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <space />
-            <text key="capacity" text="Capacity (overall)" default="" delete_if_empty="true" />
-            <combo key="capacity:disabled" text="Spaces for Disabled" values="yes,no,unknown,1,2,3" default="" delete_if_empty="true" />
-            <combo key="capacity:women" text="Spaces for Women" values="yes,no,unknown,1,2,3" default="" delete_if_empty="true" />
-            <combo key="capacity:parent" text="Spaces for Parents" values="yes,no,unknown,1,2,3" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference number" />
+            <combo key="parking" text="Type" values="multi-storey,surface,underground" default="surface" />
+            <text key="maxheight" text="Max. height (meters)" />
+            <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
+            <combo key="park_ride" text="Park and Ride" values="yes,no" />
+            <combo key="fee" text="Fee" values="yes,no" />
+            <text key="operator" text="Operator" />
+            <space />
+            <text key="capacity" text="Capacity (overall)" />
+            <combo key="capacity:disabled" text="Spaces for Disabled" values="yes,no,unknown,1,2,3" />
+            <combo key="capacity:women" text="Spaces for Women" values="yes,no,unknown,1,2,3" />
+            <combo key="capacity:parent" text="Spaces for Parents" values="yes,no,unknown,1,2,3" />
             <label text="See the Wiki for other capacity:[types]=*." />
         </item>
@@ -1944,18 +1944,18 @@
             <label text="Edit Parking space" />
             <key key="amenity" value="parking_space" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
-            <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" delete_if_empty="true" />
-            <text key="capacity" text="Capacity" default="" delete_if_empty="true" />
-            <space />
-            <combo key="access" text="Access" values="yes,private,customers,permissive,no" default="" delete_if_empty="true" />
-            <combo key="fee" text="Fee" values="yes,no,interval" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
-            <combo key="covered" text="Covered (with roof)" values="yes,no" default="" delete_if_empty="true" />
-            <combo key="stay" text="Time Limit (minutes)" values="0,30-60,30-180,30+" default="" delete_if_empty="true" />
-            <combo key="supervised" text="Supervised" values="yes,no,interval" default="" delete_if_empty="true" />
-            <combo key="lit" text="Lit" values="yes,no,interval" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference number" />
+            <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
+            <text key="capacity" text="Capacity" />
+            <space />
+            <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
+            <combo key="fee" text="Fee" values="yes,no,interval" />
+            <text key="operator" text="Operator" />
+            <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+            <combo key="covered" text="Covered (with roof)" values="yes,no" />
+            <combo key="stay" text="Time Limit (minutes)" values="0,30-60,30-180,30+" />
+            <combo key="supervised" text="Supervised" values="yes,no,interval" />
+            <combo key="lit" text="Lit" values="yes,no,interval" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Parking entrance" icon="presets/parking.png" type="node">
@@ -1963,17 +1963,17 @@
             <label text="Edit Parking entrance" />
             <key key="amenity" value="parking_entrance" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
-            <space />
-            <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" delete_if_empty="true" />
-            <combo key="access" text="Access" values="yes,private,customers,permissive,no" default="" delete_if_empty="true" />
-            <combo key="fee" text="Fee" values="yes,no,interval" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
-            <combo key="covered" text="Covered (with roof)" values="yes,no" default="" delete_if_empty="true" />
-            <combo key="stay" text="Time Limit (minutes)" values="0,30-60,30-180,30+" default="" delete_if_empty="true" />
-            <combo key="supervised" text="Supervised" values="yes,no,interval" default="" delete_if_empty="true" />
-            <combo key="lit" text="Lit" values="yes,no,interval" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference number" />
+            <space />
+            <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
+            <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
+            <combo key="fee" text="Fee" values="yes,no,interval" />
+            <text key="operator" text="Operator" />
+            <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+            <combo key="covered" text="Covered (with roof)" values="yes,no" />
+            <combo key="stay" text="Time Limit (minutes)" values="0,30-60,30-180,30+" />
+            <combo key="supervised" text="Supervised" values="yes,no,interval" />
+            <combo key="lit" text="Lit" values="yes,no,interval" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <separator/>
@@ -1990,27 +1990,27 @@
             <label text="Edit Fuel" />
             <key key="amenity" value="fuel" />
-            <combo key="brand" text="Brand" values="Agip,Aral,Avia,BP,Chevron,Citgo,Esso,Exxon,Gulf,Mobil,OMV,Petro-Canada,Pioneer,Q8,Repsol,Shell,Sunoco,Statoil,Tamoil,Texaco,Total,Independent" default="" delete_if_empty="true" />
-            <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <text key="operator" text="Operator" default="" delete_if_empty="true" />
-                <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-                <combo key="shop" text="With shop" values="yes,convenience,kiosk,no" default="" delete_if_empty="true" />
+            <combo key="brand" text="Brand" values="Agip,Aral,Avia,BP,Chevron,Citgo,Esso,Exxon,Gulf,Mobil,OMV,Petro-Canada,Pioneer,Q8,Repsol,Shell,Sunoco,Statoil,Tamoil,Texaco,Total,Independent" />
+            <optional>
+                <text key="name" text="Name" />
+                <text key="operator" text="Operator" />
+                <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+                <combo key="shop" text="With shop" values="yes,convenience,kiosk,no" />
                 <label text="Fuel types:" />
-                <check key="fuel:diesel" text="Diesel" default="off" delete_if_empty="true" />
-                <check key="fuel:biodiesel" text="Bio Diesel" default="off" delete_if_empty="true" />
-                <check key="fuel:GTL_diesel" text="Diesel (Gas To Liquid - ultimate diesel)" default="off" delete_if_empty="true" />
-                <check key="fuel:HGV_diesel" text="Diesel for Heavy Good Vehicles" default="off" delete_if_empty="true" />
-                <check key="fuel:octane_80" text="Octane 80" default="off" delete_if_empty="true" />
-                <check key="fuel:octane_91" text="Octane 91" default="off" delete_if_empty="true" />
-                <check key="fuel:octane_92" text="Octane 92" default="off" delete_if_empty="true" />
-                <check key="fuel:octane_95" text="Octane 95" default="off" delete_if_empty="true" />
-                <check key="fuel:octane_98" text="Octane 98" default="off" delete_if_empty="true" />
-                <check key="fuel:octane_100" text="Octane 100" default="off" delete_if_empty="true" />
-                <check key="fuel:e10" text="E10 (10% Ethanol mix)" default="off" delete_if_empty="true" />
-                <check key="fuel:e85" text="E85 (85% Ethanol mix)" default="off" delete_if_empty="true" />
-                <check key="fuel:lpg" text="LPG (Liquefied petroleum gas)" default="off" delete_if_empty="true" />
-                <check key="fuel:cng" text="CNG (Compressed Natural Gas)" default="off" delete_if_empty="true" />
-                <check key="fuel:1_25" text="1/25 mix (mofa/moped)" default="off" delete_if_empty="true" />
-                <check key="fuel:1_50" text="1/50 mix (mofa/moped)" default="off" delete_if_empty="true" />
+                <check key="fuel:diesel" text="Diesel" default="off" />
+                <check key="fuel:biodiesel" text="Bio Diesel" default="off" />
+                <check key="fuel:GTL_diesel" text="Diesel (Gas To Liquid - ultimate diesel)" default="off" />
+                <check key="fuel:HGV_diesel" text="Diesel for Heavy Good Vehicles" default="off" />
+                <check key="fuel:octane_80" text="Octane 80" default="off" />
+                <check key="fuel:octane_91" text="Octane 91" default="off" />
+                <check key="fuel:octane_92" text="Octane 92" default="off" />
+                <check key="fuel:octane_95" text="Octane 95" default="off" />
+                <check key="fuel:octane_98" text="Octane 98" default="off" />
+                <check key="fuel:octane_100" text="Octane 100" default="off" />
+                <check key="fuel:e10" text="E10 (10% Ethanol mix)" default="off" />
+                <check key="fuel:e85" text="E85 (85% Ethanol mix)" default="off" />
+                <check key="fuel:lpg" text="LPG (Liquefied petroleum gas)" default="off" />
+                <check key="fuel:cng" text="CNG (Compressed Natural Gas)" default="off" />
+                <check key="fuel:1_25" text="1/25 mix (mofa/moped)" default="off" />
+                <check key="fuel:1_50" text="1/50 mix (mofa/moped)" default="off" />
             </optional>
         </item>
@@ -2019,15 +2019,15 @@
             <label text="Edit Charging Station (for electric cars)" />
             <key key="amenity" value="charging_station" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <text key="voltage" text="Voltage" default="" delete_if_empty="true" />
-            <text key="amperage" text="Amperage" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" />
+            <text key="voltage" text="Voltage" />
+            <text key="amperage" text="Amperage" />
         </item>            
         <item name="Wash" icon="presets/car_wash.png" type="node,closedway">
             <label text="Edit Car Wash" />
             <key key="amenity" value="car_wash" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="brand" text="Brand" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="brand" text="Brand" />
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <separator/>
@@ -2042,27 +2042,27 @@
             <label text="Edit Car Shop" />
             <key key="shop" value="car" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
         </item>
         <item name="Repair" icon="presets/car_repair.png" type="node,closedway">
             <label text="Edit Car Repair" />
             <key key="shop" value="car_repair" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="brand" text="Brand" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="brand" text="Brand" />
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Tyres" icon="presets/tyres.png" type="node,closedway">
             <label text="Edit Tyres" />
             <key key="shop" value="tyres" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="brand" text="Brand" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="brand" text="Brand" />
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
             <label text="Contact:" />
-                <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-                <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
-                <text key="website" text="Website" default="" delete_if_empty="true" />
-                <text key="email" text="Email Address" default="" delete_if_empty="true" />
+                <text key="phone" text="Phone Number" />
+                <text key="fax" text="Fax Number" />
+                <text key="website" text="Website" />
+                <text key="email" text="Email Address" />
          </item>
         <separator/>
@@ -2075,8 +2075,8 @@
             <label text="Edit Car Rental" />
             <key key="amenity" value="car_rental" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="brand" text="Brand" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="brand" text="Brand" />
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Sharing" icon="presets/car_sharing.png" type="node,closedway">
@@ -2090,9 +2090,9 @@
             <label text="Edit Car Sharing" />
             <key key="amenity" value="car_sharing" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <text key="capacity" text="Capacity" default="" delete_if_empty="true" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" />
+            <text key="capacity" text="Capacity" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <text key="website" text="Website" />
         </item>
     </group> <!-- Car -->
@@ -2101,8 +2101,8 @@
             <label text="Edit Motorcycle Parking" />
             <key key="amenity" value="motorcycle_parking" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="capacity" text="Capacity" default="" delete_if_empty="true" />
-            <combo key="parking" text="Type" values="multi-storey,surface,underground" default="surface" delete_if_empty="true" />
-            <combo key="fee" text="Fee" values="yes,no" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="capacity" text="Capacity" />
+            <combo key="parking" text="Type" values="multi-storey,surface,underground" default="surface" />
+            <combo key="fee" text="Fee" values="yes,no" />
         </item>
         <item name="Motorcycle Dealer" icon="presets/motorbike.png" type="node,closedway">
@@ -2113,21 +2113,21 @@
             <label text="Edit Shop Motorcycle" />
             <key key="shop" value="motorcycle" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="brand" text="Brand" values="independent" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="brand" text="Brand" values="independent" />
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
             <label text="Services:" />
-                <combo key="sale" text="Sale" values="yes,brand,used,no" values_context="motorcycle" default="" delete_if_empty="true" />
-                <combo key="rental" text="Rental" values="yes,brand,no" default="" delete_if_empty="true" />
-                <combo key="repair" text="Repair" values="yes,brand,oldtimer,no" default="" delete_if_empty="true" />
-                <combo key="safety_inspection" text="Safety inspection" values="yes,DEKRA,GTÜ,MOT,TÜV,no" default="" delete_if_empty="true" />
-                <combo key="parts" text="Parts" values="yes,brand,oldtimer,no" default="" delete_if_empty="true" />
-                <combo key="clothes" text="Clothes" values="yes,brand,no" default="" delete_if_empty="true" />
-                <text key="services" text="Other" default="" delete_if_empty="true" />
+                <combo key="sale" text="Sale" values="yes,brand,used,no" values_context="motorcycle" />
+                <combo key="rental" text="Rental" values="yes,brand,no" />
+                <combo key="repair" text="Repair" values="yes,brand,oldtimer,no" />
+                <combo key="safety_inspection" text="Safety inspection" values="yes,DEKRA,GTÜ,MOT,TÜV,no" />
+                <combo key="parts" text="Parts" values="yes,brand,oldtimer,no" />
+                <combo key="clothes" text="Clothes" values="yes,brand,no" />
+                <text key="services" text="Other" />
             <label text="Contact:" />
-                <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-                <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
-                <text key="website" text="Website" default="" delete_if_empty="true" />
-                <text key="email" text="Email Address" default="" delete_if_empty="true" />
+                <text key="phone" text="Phone Number" />
+                <text key="fax" text="Fax Number" />
+                <text key="website" text="Website" />
+                <text key="email" text="Email Address" />
         </item>
     </group> <!-- Motorcycle -->
@@ -2141,10 +2141,10 @@
             <label text="Edit Bicycle Parking" />
             <key key="amenity" value="bicycle_parking" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <text key="capacity" text="Capacity" default="" delete_if_empty="true" />
-            <combo key="bicycle_parking" text="Type" values="anchors,building,ground_slots,informal,lockers,shed,stands,wall_loops" default="" delete_if_empty="true" />
-            <check key="covered" text="Covered" default="off" delete_if_empty="true" />
-            <check key="supervised" text="Supervised" default="off" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+            <text key="capacity" text="Capacity" />
+            <combo key="bicycle_parking" text="Type" values="anchors,building,ground_slots,informal,lockers,shed,stands,wall_loops" />
+            <check key="covered" text="Covered" default="off" />
+            <check key="supervised" text="Supervised" default="off" />
         </item>
         <item name="Bike Dealer" icon="presets/bike.png" type="node,closedway">
@@ -2156,5 +2156,5 @@
             <label text="Edit Bicycle Shop" />
             <key key="shop" value="bicycle" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
 			<check key="service:bicycle:retail" text="Bicycles are sold" />
 			<check key="service:bicycle:second_hand" text="Second-hand bicycles are sold" />
@@ -2176,5 +2176,5 @@
             <label text="Edit Bicycle Rental" />
             <key key="amenity" value="bicycle_rental" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
     </group> <!-- Bicycle -->
@@ -2191,6 +2191,6 @@
             <key key="railway" value="station" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <text key="uic_ref" text="UIC-Reference" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
+                <text key="uic_ref" text="UIC-Reference" />
             </optional>
         </item>
@@ -2204,5 +2204,5 @@
             <key key="railway" value="halt" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
             </optional>
         </item>
@@ -2215,5 +2215,5 @@
             <key key="railway" value="tram_stop" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
             </optional>
         </item>
@@ -2225,7 +2225,7 @@
             <key key="railway" value="platform" />
             <space />
-            <text key="ref" text="Reference (track number)" default="" delete_if_empty="true" />
-            <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-            <check key="area" text="Area" default="off" delete_if_empty="true" />
+            <text key="ref" text="Reference (track number)" />
+            <text key="width" text="Width (meters)" />
+            <check key="area" text="Area" default="off" />
         </item>
         <item name="Subway Entrance" icon="presets/underground.png" type="node">
@@ -2238,7 +2238,7 @@
             <key key="railway" value="subway_entrance" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <check key="wheelchair" text="Wheelchair" default="off" delete_if_empty="true" />
-                <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
+                <text key="name" text="Name" />
+                <check key="wheelchair" text="Wheelchair" default="off" />
+                <check key="bicycle" text="Bicycle" default="off" />
             </optional>
         </item>
@@ -2253,5 +2253,5 @@
             <key key="amenity" value="bus_station" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
             </optional>
         </item>
@@ -2268,8 +2268,8 @@
             <key key="highway" value="bus_stop" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <combo key="shelter" text="Shelter" values="yes,no" default="" delete_if_empty="true" />
-                <combo key="bench" text="Bench" values="yes,no" default="" delete_if_empty="true" />
-                <combo key="tactile_paving" text="Tactile Paving" values="yes,no" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
+                <combo key="shelter" text="Shelter" values="yes,no" />
+                <combo key="bench" text="Bench" values="yes,no" />
+                <combo key="tactile_paving" text="Tactile Paving" values="yes,no" />
 
             </optional>
@@ -2279,7 +2279,7 @@
             <key key="highway" value="platform" />
             <space />
-            <text key="ref" text="Reference (track number)" default="" delete_if_empty="true" />
-            <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-            <check key="area" text="Area" default="off" delete_if_empty="true" />
+            <text key="ref" text="Reference (track number)" />
+            <text key="width" text="Width (meters)" />
+            <check key="area" text="Area" default="off" />
         </item>
         <separator/>
@@ -2291,13 +2291,13 @@
             <key key="amenity" value="vending_machine"/>
             <key key="vending" value="public_transport_tickets"/>
-            <text key="name" text="Name" default="" delete_if_empty="true"/>
-            <text key="operator" text="Operator" default="" delete_if_empty="true"/>
-            <text key="ref" text="Reference Number" default="" delete_if_empty="true"/>
-            <check key="payment:coins" text="Coins" default="off" delete_if_empty="true" />
-            <check key="payment:notes" text="Notes" default="off" delete_if_empty="true" />
-            <check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" delete_if_empty="true" />
-            <check key="payment:debit_cards" text="Debit cards" default="off" delete_if_empty="true" />
-            <check key="payment:credit_cards" text="Credit cards" default="off" delete_if_empty="true" />
-            <check key="payment:account_cards" text="Account or loyalty cards" default="off" delete_if_empty="true" />
+            <text key="name" text="Name"/>
+            <text key="operator" text="Operator"/>
+            <text key="ref" text="Reference Number"/>
+            <check key="payment:coins" text="Coins" default="off" />
+            <check key="payment:notes" text="Notes" default="off" />
+            <check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" />
+            <check key="payment:debit_cards" text="Debit cards" default="off" />
+            <check key="payment:credit_cards" text="Credit cards" default="off" />
+            <check key="payment:account_cards" text="Account or loyalty cards" default="off" />
         </item>
     </group> <!-- Public Transport -->
@@ -2309,5 +2309,5 @@
         <label text="Edit Taxi station" />
         <key key="amenity" value="taxi" />
-        <text key="name" text="Name" default="" delete_if_empty="true" />
+        <text key="name" text="Name" />
     </item>
     <separator/>
@@ -2319,9 +2319,9 @@
             <label text="Edit Airport Ground" />
             <key key="aeroway" value="aerodrome" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <optional>
-                <text key="iata" text="IATA" default="" delete_if_empty="true" />
-                <text key="icao" text="ICAO" default="" delete_if_empty="true" />
-                <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <optional>
+                <text key="iata" text="IATA" />
+                <text key="icao" text="ICAO" />
+                <text key="wikipedia" text="Wikipedia" />
             </optional>
         </item>
@@ -2336,5 +2336,5 @@
             <key key="aeroway" value="runway" />
             <optional>
-                <text key="ref" text="Reference" default="" delete_if_empty="true" />
+                <text key="ref" text="Reference" />
             </optional>
         </item>
@@ -2347,5 +2347,5 @@
             <key key="aeroway" value="taxiway" />
             <optional>
-                <text key="ref" text="Reference" default="" delete_if_empty="true" />
+                <text key="ref" text="Reference" />
             </optional>
         </item>
@@ -2358,5 +2358,5 @@
             <key key="aeroway" value="helipad" />
             <optional>
-                <text key="ref" text="Reference" default="" delete_if_empty="true" />
+                <text key="ref" text="Reference" />
             </optional>
         </item>
@@ -2395,5 +2395,5 @@
             <label text="Edit Terminal" />
             <key key="aeroway" value="terminal" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Gate" name_context="airport" icon="presets/aeroway_gate.png" type="node">
@@ -2403,5 +2403,5 @@
             <label text="Edit Terminal Gate" />
             <key key="aeroway" value="gate" />
-            <text key="ref" text="Reference" default="" delete_if_empty="true" />
+            <text key="ref" text="Reference" />
         </item>
     </group> <!-- Aeroway -->
@@ -2417,17 +2417,17 @@
             <label text="Edit Hotel" />
             <key key="tourism" value="hotel" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" default="" delete_if_empty="true" />
-            <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
-            <space />
-            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
-            <text key="email" text="Email Address" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <space />
+            <text key="phone" text="Phone Number" />
+            <text key="fax" text="Fax Number" />
+            <text key="website" text="Website" />
+            <text key="email" text="Email Address" />
         </item>
         <item name="Motel" icon="styles/standard/accommodation/motel.png" type="node,closedway">
@@ -2437,33 +2437,33 @@
             <label text="Edit Motel" />
             <key key="tourism" value="motel" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" default="" delete_if_empty="true" />
-            <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
-            <space />
-            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
-            <text key="email" text="Email Address" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <space />
+            <text key="phone" text="Phone Number" />
+            <text key="fax" text="Fax Number" />
+            <text key="website" text="Website" />
+            <text key="email" text="Email Address" />
         </item>
         <item name="Guest House" icon="styles/standard/accommodation/guest_house.png" type="node,closedway">
             <label text="Edit Guest House" />
             <key key="tourism" value="guest_house" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" default="" delete_if_empty="true" />
-            <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
-            <space />
-            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
-            <text key="email" text="Email Address" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <space />
+            <text key="phone" text="Phone Number" />
+            <text key="fax" text="Fax Number" />
+            <text key="website" text="Website" />
+            <text key="email" text="Email Address" />
         </item>
         <item name="Chalet" icon="styles/standard/accommodation/chalet.png" type="node,closedway">
@@ -2472,16 +2472,16 @@
             <label text="Edit Chalet" />
             <key key="tourism" value="chalet" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" default="" delete_if_empty="true" />
-            <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
-            <space />
-            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
-            <text key="email" text="Email Address" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <space />
+            <text key="phone" text="Phone Number" />
+            <text key="fax" text="Fax Number" />
+            <text key="website" text="Website" />
+            <text key="email" text="Email Address" />
         </item>
         <item name="Hostel" icon="presets/hostel.png" type="node,closedway">
@@ -2491,34 +2491,34 @@
             <label text="Edit Hostel" />
             <key key="tourism" value="hostel" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" default="" delete_if_empty="true" />
-            <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
-            <space />
-            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
-            <text key="email" text="Email Address" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <space />
+            <text key="phone" text="Phone Number" />
+            <text key="fax" text="Fax Number" />
+            <text key="website" text="Website" />
+            <text key="email" text="Email Address" />
         </item>
         <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut.png" type="node,closedway">
             <label text="Edit Alpine Hut" />
             <key key="tourism" value="alpine_hut" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <text key="ele" text="Elevation" default="" delete_if_empty="true" />
-            <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
-            <space />
-            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
-            <text key="email" text="Email Address" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+            <text key="ele" text="Elevation" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <space />
+            <text key="phone" text="Phone Number" />
+            <text key="fax" text="Fax Number" />
+            <text key="website" text="Website" />
+            <text key="email" text="Email Address" />
         </item>
         <separator/>
@@ -2526,21 +2526,21 @@
             <label text="Edit Caravan Site" />
             <key key="tourism" value="caravan_site" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" default="" delete_if_empty="true" />
-            <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
-            <space />
-            <text key="capacity" text="Number of places" default="" delete_if_empty="true" />
-            <combo key="fee" text="Requires a fee" values="yes,no,interval" delete_if_empty="true" />
-            <check key="power_supply" text="Power supply" default="off" delete_if_empty="true" />
-            <check key="tents" text="Tents allowed" default="off" delete_if_empty="true" />
-            <space />
-            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
-            <text key="email" text="Email Address" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <space />
+            <text key="capacity" text="Number of places" />
+            <combo key="fee" text="Requires a fee" values="yes,no,interval" />
+            <check key="power_supply" text="Power supply" default="off" />
+            <check key="tents" text="Tents allowed" default="off" />
+            <space />
+            <text key="phone" text="Phone Number" />
+            <text key="fax" text="Fax Number" />
+            <text key="website" text="Website" />
+            <text key="email" text="Email Address" />
         </item>
         <item name="Camping Site" icon="presets/tent.png" type="node,closedway">
@@ -2551,16 +2551,16 @@
             <label text="Edit Camping Site" />
             <key key="tourism" value="camp_site" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" default="" delete_if_empty="true" />
-            <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
-            <space />
-            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
-            <text key="email" text="Email Address" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <space />
+            <text key="phone" text="Phone Number" />
+            <text key="fax" text="Fax Number" />
+            <text key="website" text="Website" />
+            <text key="email" text="Email Address" />
         </item>
     </group> <!-- Accomodation -->
@@ -2575,20 +2575,20 @@
             <label text="Edit Restaurant" />
             <key key="amenity" value="restaurant" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <multiselect key="cuisine" text="Cuisine" values="italian;chinese;pizza;burger;greek;german;indian;regional;kebab;turkish;asian;thai;mexican;japanese;french;sandwich;sushi" default=""/>
-            <check key="microbrewery" text="Microbrewery" default="off" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" default="" delete_if_empty="true" />
-            <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
-            <space />
-            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
-            <text key="email" text="Email Address" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+            <multiselect key="cuisine" text="Cuisine" values="italian;chinese;pizza;burger;greek;german;indian;regional;kebab;turkish;asian;thai;mexican;japanese;french;sandwich;sushi"/>
+            <check key="microbrewery" text="Microbrewery" default="off" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <space />
+            <text key="phone" text="Phone Number" />
+            <text key="fax" text="Fax Number" />
+            <text key="website" text="Website" />
+            <text key="email" text="Email Address" />
         </item>
         <item name="Fast Food" icon="presets/fastfood.png" type="node,closedway">
@@ -2600,18 +2600,18 @@
             <label text="Edit Fast Food Restaurant" />
             <key key="amenity" value="fast_food" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="cuisine" text="Cuisine" values="italian,chinese,pizza,burger,greek,german,indian,regional,kebab,turkish,asian,thai,mexican,japanese,french,sandwich,sushi,fish_and_chips,chicken" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-            <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
-            <space />
-            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
-            <text key="email" text="Email Address" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+            <combo key="cuisine" text="Cuisine" values="italian,chinese,pizza,burger,greek,german,indian,regional,kebab,turkish,asian,thai,mexican,japanese,french,sandwich,sushi,fish_and_chips,chicken" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <space />
+            <text key="phone" text="Phone Number" />
+            <text key="fax" text="Fax Number" />
+            <text key="website" text="Website" />
+            <text key="email" text="Email Address" />
         </item>
         <item name="Food Court" icon="presets/fastfood.png" type="node,closedway">
@@ -2621,16 +2621,16 @@
             <label text="Edit Food Court" />
             <key key="amenity" value="food_court" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-            <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
-            <space />
-            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
-            <text key="email" text="Email Address" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <space />
+            <text key="phone" text="Phone Number" />
+            <text key="fax" text="Fax Number" />
+            <text key="website" text="Website" />
+            <text key="email" text="Email Address" />
         </item>
         <item name="Cafe" icon="presets/cafe.png" type="node,closedway">
@@ -2642,18 +2642,18 @@
             <label text="Edit Cafe" />
             <key key="amenity" value="cafe" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="cuisine" text="Cuisine" values="ice_cream" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-            <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
-            <space />
-            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
-            <text key="email" text="Email Address" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+            <combo key="cuisine" text="Cuisine" values="ice_cream" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <space />
+            <text key="phone" text="Phone Number" />
+            <text key="fax" text="Fax Number" />
+            <text key="website" text="Website" />
+            <text key="email" text="Email Address" />
         </item>
         <item name="Pub" icon="presets/pub.png" type="node,closedway">
@@ -2664,34 +2664,34 @@
             <label text="Edit Pub" />
             <key key="amenity" value="pub" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <check key="microbrewery" text="Microbrewery" default="off" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-            <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
-            <space />
-            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
-            <text key="email" text="Email Address" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+            <check key="microbrewery" text="Microbrewery" default="off" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <space />
+            <text key="phone" text="Phone Number" />
+            <text key="fax" text="Fax Number" />
+            <text key="website" text="Website" />
+            <text key="email" text="Email Address" />
         </item>
         <item name="Biergarten" icon="presets/biergarten.png" type="node,closedway">
             <label text="Edit Biergarten" />
             <key key="amenity" value="biergarten" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-            <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
-            <space />
-            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
-            <text key="email" text="Email Address" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <space />
+            <text key="phone" text="Phone Number" />
+            <text key="fax" text="Fax Number" />
+            <text key="website" text="Website" />
+            <text key="email" text="Email Address" />
         </item>
         <item name="Bar" icon="presets/bar.png" type="node,closedway">
@@ -2704,16 +2704,16 @@
             <label text="Edit Bar" />
             <key key="amenity" value="bar" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-            <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
-            <space />
-            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
-            <text key="email" text="Email Address" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <space />
+            <text key="phone" text="Phone Number" />
+            <text key="fax" text="Fax Number" />
+            <text key="website" text="Website" />
+            <text key="email" text="Email Address" />
         </item>
         <item name="Nightclub" icon="presets/bar.png" type="node,closedway">
@@ -2726,14 +2726,14 @@
             <label text="Edit Nightclub" />
             <key key="amenity" value="nightclub" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-            <space />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
-            <space />
-            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
-            <text key="email" text="Email Address" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <space />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <space />
+            <text key="phone" text="Phone Number" />
+            <text key="fax" text="Fax Number" />
+            <text key="website" text="Website" />
+            <text key="email" text="Email Address" />
         </item>
     </group> <!-- Food+Drinks -->
@@ -2742,6 +2742,6 @@
             <label text="Edit Attraction" />
             <key key="tourism" value="attraction" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="opening_hours" text="Opening Hours" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="opening_hours" text="Opening Hours" />
         </item>
         <item name="Viewpoint" icon="presets/viewpoint.png" type="node,closedway">
@@ -2752,6 +2752,6 @@
             <label text="Edit Viewpoint" />
             <key key="tourism" value="viewpoint" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-<!--<check key="man_made" value="tower" text="Look-Out Tower" default="off" delete_if_empty="true" />-->
+            <text key="name" text="Name" />
+<!--<check key="man_made" value="tower" text="Look-Out Tower" default="off" />-->
         </item>
         <separator/>
@@ -2764,6 +2764,6 @@
             <key key="tourism" value="information" />
             <key key="information" value="office" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Map" icon="presets/map.png" type="node">
@@ -2771,15 +2771,15 @@
             <key key="tourism" value="information" />
             <key key="information" value="map" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="map_type" text="Detail Grade" values="topo,street,scheme" default="" delete_if_empty="true" />
-            <combo key="map_size" text="Shown Area" values="site,city,region" default="" delete_if_empty="true" />
-            <text key="description" text="Closer Description" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="map_type" text="Detail Grade" values="topo,street,scheme" />
+            <combo key="map_size" text="Shown Area" values="site,city,region" />
+            <text key="description" text="Closer Description" />
             <space />
             <label text="Routes shown for:" />
-            <check key="hiking" text="Hiking" default="off" delete_if_empty="true" />
-            <check key="bicycle" text="Cycling" default="off" delete_if_empty="true" />
-            <check key="mtb" text="Mountainbiking" default="off" delete_if_empty="true" />
-            <check key="ski" text="Skiing" default="off" delete_if_empty="true" />
-            <check key="horse" text="Riding" default="off" delete_if_empty="true" />
+            <check key="hiking" text="Hiking" default="off" />
+            <check key="bicycle" text="Cycling" default="off" />
+            <check key="mtb" text="Mountainbiking" default="off" />
+            <check key="ski" text="Skiing" default="off" />
+            <check key="horse" text="Riding" default="off" />
             <label text="... other transportation modes possible" />
         </item>
@@ -2790,7 +2790,7 @@
             <key key="tourism" value="information" />
             <key key="information" value="board" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="board_type" text="Board Content" values="notice,history,nature,wildlife,plants" default="board" delete_if_empty="true" />
-            <text key="description" text="Closer Description" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="board_type" text="Board Content" values="notice,history,nature,wildlife,plants" default="board" />
+            <text key="description" text="Closer Description" />
         </item>
         <item name="Guidepost" icon="presets/guidepost.png" type="node">
@@ -2803,13 +2803,13 @@
             <key key="tourism" value="information" />
             <key key="information" value="guidepost" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ele" text="Elevation" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="ele" text="Elevation" />
             <space />
             <label text="Routes shown for:" />
-            <check key="hiking" text="Hiking" default="off" delete_if_empty="true" />
-            <check key="bicycle" text="Cycling" default="off" delete_if_empty="true" />
-            <check key="mtb" text="Mountainbiking" default="off" delete_if_empty="true" />
-            <check key="ski" text="Skiing" default="off" delete_if_empty="true" />
-            <check key="horse" text="Riding" default="off" delete_if_empty="true" />
+            <check key="hiking" text="Hiking" default="off" />
+            <check key="bicycle" text="Cycling" default="off" />
+            <check key="mtb" text="Mountainbiking" default="off" />
+            <check key="ski" text="Skiing" default="off" />
+            <check key="horse" text="Riding" default="off" />
             <label text="... other transportation modes possible" />
         </item>
@@ -2818,9 +2818,9 @@
             <key key="tourism" value="information" />
             <key key="information" value="terminal" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="description" text="Closer description" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
-            <combo key="fee" text="Fee" values="yes,no" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="description" text="Closer description" />
+            <text key="operator" text="Operator" />
+            <text key="ref" text="Reference number" />
+            <combo key="fee" text="Fee" values="yes,no" />
         </item>
         <item name="Audioguide" icon="presets/information.png" type="node">
@@ -2828,12 +2828,12 @@
             <key key="tourism" value="information" />
             <key key="information" value="audioguide" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="description" text="Closer description" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
-            <combo key="fee" text="Fee" values="yes,no" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="description" text="Closer description" />
+            <text key="operator" text="Operator" />
+            <text key="ref" text="Reference number" />
+            <combo key="fee" text="Fee" values="yes,no" />
             <space />
             <label text="Audioguide via mobile phone?" />
-            <text key="phone" text="Phone number" default="" delete_if_empty="true" />
+            <text key="phone" text="Phone number" />
         </item>
         <item name="Other Information Points" icon="presets/information.png" type="node,closedway">
@@ -2842,6 +2842,6 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=information" />
             <key key="tourism" value="information" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="description" text="Closer Description" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="description" text="Closer Description" />
         </item>
     </group> <!-- Tourism -->
@@ -2855,5 +2855,5 @@
             <label text="Edit Cinema" />
             <key key="amenity" value="cinema" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Zoo" icon="presets/zoo.png" type="node,closedway">
@@ -2862,7 +2862,7 @@
             <label text="Edit Zoo" />
             <key key="tourism" value="zoo" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="Dog Park" icon="presets/dogpark.png" type="node,closedway">
@@ -2877,20 +2877,20 @@
             <label text="Edit Dog Park" />
             <key key="leisure" value="dog_park" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <check key="area" text="Area" default="off" delete_if_empty="true" />
-            <combo key="barrier" text="Barrier" values="fence,wall" default="" delete_if_empty="true" />  
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-            <check key="lit" text="Lit" default="off" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <check key="area" text="Area" default="off" />
+            <combo key="barrier" text="Barrier" values="fence,wall" />  
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <check key="lit" text="Lit" default="off" />
         </item>  
         <item name="Theme Park" icon="presets/theme_park.png" type="node,closedway">
             <label text="Edit Theme Park" />
             <key key="tourism" value="theme_park" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Water Park" icon="presets/swimming.png" type="node,closedway">
             <label text="Edit Water Park" />
             <key key="leisure" value="water_park" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Sauna" de.name="Sauna" icon="presets/sauna.png" type="node,closedway">
@@ -2901,8 +2901,8 @@
             <space />            
             <key key="leisure" value="sauna" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" de.text="Betreiber" default="" delete_if_empty="true" />            
-            <combo key="opening_hours" text="Opening Hours" de.text="Öffnungszeiten" values="Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" /> 
-            <combo key="access" text="Access" values="yes,permissive,private,unknown" default="" delete_if_empty="true" />                                           
+            <text key="name" text="Name" />            
+            <text key="operator" text="Operator" de.text="Betreiber" />            
+            <combo key="opening_hours" text="Opening Hours" de.text="Öffnungszeiten" values="Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" /> 
+            <combo key="access" text="Access" values="yes,permissive,private,unknown" />                                           
         </item> 
         <separator/>
@@ -2919,11 +2919,11 @@
             <label text="Edit Playground" />
             <key key="leisure" value="playground" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Picnic Site" icon="presets/picnic.png" type="node,closedway">
             <label text="Edit Picnic Site" />
             <key key="tourism" value="picnic_site" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <check key="fireplace" text="Fireplace" default="off" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <check key="fireplace" text="Fireplace" default="off" />
         </item>
         <item name="Public Grill" icon="presets/bbq.png" type="node">
@@ -2935,12 +2935,12 @@
             <space />            
             <key key="amenity" value="bbq" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="covered" text="Covered" values="yes,no" default="" delete_if_empty="true" />                               
-            <combo key="fuel" text="Fuel" text_context="grill" values="charcoal,electric,wood" default="" delete_if_empty="true" />                               
+            <text key="name" text="Name" />
+            <combo key="covered" text="Covered" values="yes,no" />                               
+            <combo key="fuel" text="Fuel" text_context="grill" values="charcoal,electric,wood" />                               
         </item>     	
         <item name="Fishing" icon="presets/fishing.png" type="node,closedway">
             <label text="Edit Fishing" />
             <key key="leisure" value="fishing" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Private Swimming Pool" icon="presets/swimming.png" type="node,closedway">
@@ -2955,7 +2955,7 @@
             <label text="Edit Museum" />
             <key key="tourism" value="museum" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="Theatre" icon="presets/theater.png" type="node,closedway,relation">
@@ -2966,5 +2966,5 @@
             <label text="Edit Theatre" />
             <key key="amenity" value="theatre" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Library" icon="styles/standard/shop/rental/library.png" type="node,closedway,relation">
@@ -2977,6 +2977,6 @@
             <label text="Edit Library" />
             <key key="amenity" value="library" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,relation">
@@ -2987,5 +2987,5 @@
             <label text="Edit Arts Centre" />
             <key key="amenity" value="arts_centre" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway">
@@ -2997,5 +2997,5 @@
             <label text="Edit Artwork" />
             <key key="tourism" value="artwork" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Place of Worship" icon="presets/church.png" type="node,closedway,relation">
@@ -3011,9 +3011,9 @@
             <label text="Edit Place of Worship" />
             <key key="amenity" value="place_of_worship" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" default="" delete_if_empty="true" />
-            <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" default="" delete_if_empty="true" />
-            <combo key="service_times" text="Service Times" values="Su 10:00,Su 10:30,Su 11:00" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours for visiting" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
+            <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
+            <combo key="service_times" text="Service Times" values="Su 10:00,Su 10:30,Su 11:00" />
+            <combo key="opening_hours" text="Opening Hours for visiting" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Recording Studio" icon="presets/studio.png" type="node">
@@ -3023,9 +3023,9 @@
             <space />            
             <key key="amenity" value="studio" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />            
-            <combo key="type" text="Type" values="audio,video" default="" delete_if_empty="true" />
-            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />                          
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />            
+            <combo key="type" text="Type" values="audio,video" />
+            <text key="phone" text="Phone Number" />
+            <text key="website" text="Website" />                          
         </item>        
     </group> <!-- Culture -->
@@ -3038,5 +3038,5 @@
             <label text="Edit Public Building" />
             <key key="amenity" value="public_building" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Town hall" icon="presets/townhall.png" type="node,closedway,relation">
@@ -3049,5 +3049,5 @@
             <label text="Edit Town hall" />
             <key key="amenity" value="townhall" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Community Centre" icon="presets/community_centre.png" type="node,closedway">      	
@@ -3061,7 +3061,7 @@
             <space />            
             <key key="amenity" value="community_centre" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" /> 
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />                      
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" /> 
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />                      
         </item>       	
         <item name="Embassy" icon="presets/embassy.png" type="node,closedway,relation">
@@ -3072,5 +3072,5 @@
             <label text="Edit Embassy" />
             <key key="amenity" value="embassy" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Courthouse" icon="presets/JusticeScales.png" type="node,closedway,relation">
@@ -3081,5 +3081,5 @@
             <label text="Edit Courthouse" />
             <key key="amenity" value="courthouse" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Prison" icon="presets/prison.png" type="node,closedway,relation">
@@ -3089,5 +3089,5 @@
             <label text="Edit Prison" />
             <key key="amenity" value="prison" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Police" icon="styles/standard/service/police.png" type="node,closedway,relation">
@@ -3101,5 +3101,5 @@
             <label text="Edit Police" />
             <key key="amenity" value="police" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Fire Station" icon="presets/firebrigade.png" type="node,closedway,relation">
@@ -3113,5 +3113,5 @@
             <label text="Edit Fire Station" />
             <key key="amenity" value="fire_station" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Post Office" icon="styles/standard/service/post_office.png" type="node,closedway,relation">
@@ -3123,6 +3123,6 @@
             <label text="Edit Post Office" />
             <key key="amenity" value="post_office" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+        <text key="operator" text="Operator" />
         </item>
     </group> <!-- Public Buildings -->
@@ -3131,5 +3131,5 @@
             <label text="Edit Kindergarten" />
             <key key="amenity" value="kindergarten" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="School" icon="presets/school.png" type="node,closedway,relation">
@@ -3145,5 +3145,5 @@
             <label text="Edit School" />
             <key key="amenity" value="school" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="University" icon="styles/standard/education/university.png" type="node,closedway,relation">
@@ -3156,5 +3156,5 @@
             <label text="Edit University" />
             <key key="amenity" value="university" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="College" icon="styles/standard/education/college.png" type="node,closedway,relation">
@@ -3166,5 +3166,5 @@
             <label text="Edit College" />
             <key key="amenity" value="college" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
          <item name="Driving School" icon="styles/standard/education/driving_school.png" type="node,closedway">
@@ -3173,7 +3173,7 @@
             <space />
             <key key="amenity" value="driving_school" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <text key="license_classes" text="License Classes" values="A1;A;B;BE;C" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+            <text key="license_classes" text="License Classes" values="A1;A;B;BE;C" />
         </item>
     </group> <!-- Education -->
@@ -3189,5 +3189,5 @@
             <label text="Edit Hospital" />
             <key key="amenity" value="hospital" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Doctors" icon="styles/standard/health/doctor.png" type="node,closedway">
@@ -3197,18 +3197,18 @@
             <label text="Edit Doctors" />
             <key key="amenity" value="doctors" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway">
             <label text="Edit Dentist" />
             <key key="amenity" value="dentist" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Nursing Home" type="node,closedway">
             <label text="Edit Nursing Home" />
             <key key="amenity" value="nursing_home" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
         </item>
         <separator/>
@@ -3223,7 +3223,7 @@
             <label text="Edit Pharmacy" />
             <key key="amenity" value="pharmacy" />
-            <combo key="dispensing" text="Dispensing" values="yes,no" default="no" delete_if_empty="true" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="dispensing" text="Dispensing" values="yes,no" default="no" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway">
@@ -3233,7 +3233,7 @@
             <space />
             <key key="shop" value="hearing_aids" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
         </item>
         <separator/>
@@ -3251,6 +3251,6 @@
             <label text="Edit Baby Hatch" />
             <key key="amenity" value="baby_hatch" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <text key="opening_hours" text="Opening Hours" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" />
+            <text key="opening_hours" text="Opening Hours" />
         </item>
         <separator/>
@@ -3264,8 +3264,8 @@
             <space />
             <key key="highway" value="emergency_access_point" />
-            <text key="ref" text="Point Number" default="" delete_if_empty="true" />
-            <text key="name" text="Point Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
+            <text key="ref" text="Point Number" />
+            <text key="name" text="Point Name" />
+            <text key="operator" text="Operator" />
+            <text key="phone" text="Phone Number" />
             <label text="(Use international code, like +12-345-67890)" />
             <space />
@@ -3280,6 +3280,6 @@
             <label text="Edit Veterinary" />
             <key key="amenity" value="veterinary" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
     </group> <!-- Health -->
@@ -3293,9 +3293,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=toilets" />
             <key key="amenity" value="toilets" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
-            <combo key="fee" text="Fee" values="yes,no" default="" delete_if_empty="true" />
-            <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" default="" delete_if_empty="true" />
-            <text key="note" text="Note" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" />
+            <text key="ref" text="Reference number" />
+            <combo key="fee" text="Fee" values="yes,no" />
+            <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" />
+            <text key="note" text="Note" />
         </item>
         <item name="Post Box" icon="styles/standard/service/post_box.png" type="node">
@@ -3304,5 +3304,5 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=post_box" />
             <key key="amenity" value="post_box" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" />
         </item>
         <item name="Telephone" icon="presets/telephone.png" type="node">
@@ -3316,11 +3316,11 @@
             <label text="Edit Telephone" />
             <key key="amenity" value="telephone" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <check key="payment:coins" text="Coins" default="off" delete_if_empty="true" />
-            <check key="payment:notes" text="Notes" default="off" delete_if_empty="true" />
-            <check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" delete_if_empty="true" />
-            <check key="payment:debit_cards" text="Debit cards" default="off" delete_if_empty="true" />
-            <check key="payment:credit_cards" text="Credit cards" default="off" delete_if_empty="true" />
-            <check key="payment:telephone_cards" text="Telephone cards" default="off" delete_if_empty="true" />
+            <text key="operator" text="Operator" />
+            <check key="payment:coins" text="Coins" default="off" />
+            <check key="payment:notes" text="Notes" default="off" />
+            <check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" />
+            <check key="payment:debit_cards" text="Debit cards" default="off" />
+            <check key="payment:credit_cards" text="Credit cards" default="off" />
+            <check key="payment:telephone_cards" text="Telephone cards" default="off" />
         </item>
         <item name="Clock" icon="styles/standard/service/clock.png" type="node">
@@ -3332,11 +3332,11 @@
             <key key="amenity" value="clock" />
             <optional>
-                <combo key="display" text="Display" values="analog,digital,sundial,unorthodox" values_context="display" default="" delete_if_empty="true" />
-                <combo key="support" text="Support" values="pole,wall_mounted,billboard,ground" default="" delete_if_empty="true" />
-                <combo key="visibility" text="Visibility/readability" values="house,street,area" display_values="house (up to 5m),street (up to 20m),area (more than 20m)" default="" delete_if_empty="true" />
-                <check key="date" text="Shows current date" default="off" delete_if_empty="true" />
-                <check key="thermometer" text="Shows temperature" default="off" delete_if_empty="true" />
-                <check key="barometer" text="Shows barometric pressure" default="off" delete_if_empty="true" />
-                <check key="hygrometer" text="Shows humidity" default="off" delete_if_empty="true" />
+                <combo key="display" text="Display" values="analog,digital,sundial,unorthodox" values_context="display" />
+                <combo key="support" text="Support" values="pole,wall_mounted,billboard,ground" />
+                <combo key="visibility" text="Visibility/readability" values="house,street,area" display_values="house (up to 5m),street (up to 20m),area (more than 20m)" />
+                <check key="date" text="Shows current date" default="off" />
+                <check key="thermometer" text="Shows temperature" default="off" />
+                <check key="barometer" text="Shows barometric pressure" default="off" />
+                <check key="hygrometer" text="Shows humidity" default="off" />
             </optional>
         </item>
@@ -3352,11 +3352,11 @@
             <label text="Edit Recycling station" />
             <key key="amenity" value="recycling" />
-            <check key="recycling:batteries" text="Batteries" default="off" delete_if_empty="true" />
-            <check key="recycling:cans" text="Cans" default="off" delete_if_empty="true" />
-            <check key="recycling:clothes" text="Clothes" default="off" delete_if_empty="true" />
-            <check key="recycling:glass" text="Glass" default="off" delete_if_empty="true" />
-            <check key="recycling:paper" text="Paper" default="off" delete_if_empty="true" />
-            <check key="recycling:scrap_metal" text="Scrap Metal" default="off" delete_if_empty="true" />
-            <combo key="recycling_type" text="Type" values="container,centre" default="" delete_if_empty="true" />
+            <check key="recycling:batteries" text="Batteries" default="off" />
+            <check key="recycling:cans" text="Cans" default="off" />
+            <check key="recycling:clothes" text="Clothes" default="off" />
+            <check key="recycling:glass" text="Glass" default="off" />
+            <check key="recycling:paper" text="Paper" default="off" />
+            <check key="recycling:scrap_metal" text="Scrap Metal" default="off" />
+            <combo key="recycling_type" text="Type" values="container,centre" />
         </item>
         <item name="Waste Basket" icon="styles/standard/service/recycling/trash-bin.png" type="node">
@@ -3376,23 +3376,23 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bench" />
             <key key="amenity" value="bench" />
-            <combo key="backrest" text="Backrest" values="yes,no" default="" delete_if_empty="true" />
-            <combo key="material" text="Material" values="stone,metal,wood,plastic" default="" delete_if_empty="true" />
-            <combo key="colour" text="Colour" values_context="color" values="black,brown,green,red,blue,gray,white" default="" delete_if_empty="true" />
-            <combo key="seats" text="Amount of Seats" values="2,3,4,5,6,7,8,9,10" default="" delete_if_empty="true" />
+            <combo key="backrest" text="Backrest" values="yes,no" />
+            <combo key="material" text="Material" values="stone,metal,wood,plastic" />
+            <combo key="colour" text="Colour" values_context="color" values="black,brown,green,red,blue,gray,white" />
+            <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" />
             <key key="amenity" value="shelter" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <check key="fireplace" text="Fireplace" default="off" delete_if_empty="true" />
-            <combo key="shelter_type" text="Type of shelter" values="weather_shelter,public_transport,picnic_shelter,wildlife_hide" values_context="shelter" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <check key="fireplace" text="Fireplace" default="off" />
+            <combo key="shelter_type" text="Type of shelter" values="weather_shelter,public_transport,picnic_shelter,wildlife_hide" values_context="shelter" />
         </item>
         <item name="Hunting Stand" icon="presets/hunting_stand.png" type="node">
             <label text="Edit Hunting Stand" />
             <key key="amenity" value="hunting_stand" />
-            <combo key="height" text="Height" values="low,half,full,5,10,15,20" default="" delete_if_empty="true" />
-            <combo key="shelter" text="Shelter" values="yes,no,unknown" default="" delete_if_empty="true" />
-            <combo key="hide" text="Hide" values="yes,no,unknown" default="" delete_if_empty="true" />
-            <combo key="lock" text="Lock" values="yes,no,unknown" default="" delete_if_empty="true" />
+            <combo key="height" text="Height" values="low,half,full,5,10,15,20" />
+            <combo key="shelter" text="Shelter" values="yes,no,unknown" />
+            <combo key="hide" text="Hide" values="yes,no,unknown" />
+            <combo key="lock" text="Lock" values="yes,no,unknown" />
         </item>
         <separator/>
@@ -3405,5 +3405,5 @@
             <label text="Edit Drinking Water" />
             <key key="amenity" value="drinking_water" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Fire Hydrant" icon="presets/fire_hydrant.png" type="node">
@@ -3415,14 +3415,14 @@
             <label text="Edit Fire Hydrant" />
             <key key="emergency" value="fire_hydrant" />
-            <combo key="fire_hydrant:type" text="Type" values="underground,pillar,wall,pond" values_context="pipeline" default="pillar" delete_if_empty="true" />
-            <combo key="fire_hydrant:diameter" text="Diameter (in mm)" values="50,80,100,150,200,250,300,400" default="" delete_if_empty="true" />
-            <space />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <space />
-            <combo key="fire_hydrant:position" text="Position" values_context="hydrant position" values="lane,parking_lot,sidewalk,green" default="" delete_if_empty="true" />
-            <combo key="fire_hydrant:pressure" text="Pressure (in bar)" values="5,6,8,suction" default="" delete_if_empty="true" />
-            <text key="fire_hydrant:count" text="Count" values="" default="" delete_if_empty="true" />
+            <combo key="fire_hydrant:type" text="Type" values="underground,pillar,wall,pond" values_context="pipeline" default="pillar" />
+            <combo key="fire_hydrant:diameter" text="Diameter (in mm)" values="50,80,100,150,200,250,300,400" />
+            <space />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference" />
+            <text key="operator" text="Operator" />
+            <space />
+            <combo key="fire_hydrant:position" text="Position" values_context="hydrant position" values="lane,parking_lot,sidewalk,green" />
+            <combo key="fire_hydrant:pressure" text="Pressure (in bar)" values="5,6,8,suction" />
+            <text key="fire_hydrant:count" text="Count" values="" />
         </item>
     </group> <!-- Facilities -->
@@ -3433,48 +3433,48 @@
             <label text="Edit Stadium" />
             <key key="leisure" value="stadium" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
             <space />
             <label text="select sport:" />
             <space />
-            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
+            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" />
         </item>
         <item name="Sports Centre" icon="presets/sports_centre.png" type="node,closedway">
             <label text="Edit Sports Centre" />
             <key key="leisure" value="sports_centre" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
             <space />
             <label text="select sport:" />
             <space />
-            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
+            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" />
         </item>
         <item name="Pitch" icon="presets/pitch.png" type="node,closedway">
             <label text="Edit Pitch" />
             <key key="leisure" value="pitch" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
             <space />
             <label text="select sport:" />
             <space />
-            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,table_tennis,tennis" default="" delete_if_empty="true" />
+            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,table_tennis,tennis" />
         </item>
         <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway,relation">
             <label text="Edit Racetrack" />
             <key key="leisure" value="track" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
             <space />
             <label text="select sport:" />
             <space />
-            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,table_tennis,tennis" default="" delete_if_empty="true" />
+            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,table_tennis,tennis" />
         </item>
         <item name="Golf Course" icon="presets/golf.png" type="node,closedway">
             <label text="Edit Golf Course" />
             <key key="leisure" value="golf_course" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Miniature Golf" icon="presets/golf.png" type="node,closedway">
             <label text="Edit Miniature Golf" />
             <key key="leisure" value="miniature_golf" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
     </group> <!-- Sport facilities -->
@@ -3484,6 +3484,6 @@
             <label text="Edit Multi" />
             <key key="sport" value="multi" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" />
         </item>
         <item name="9pin" icon="styles/standard/sport/10pin.png" type="node,closedway">
@@ -3492,6 +3492,6 @@
             <label text="Edit 9pin" />
             <key key="sport" value="9pin" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" />
         </item>
         <item name="10pin" icon="styles/standard/sport/10pin.png" type="node,closedway">
@@ -3499,6 +3499,6 @@
             <label text="Edit 10pin" />
             <key key="sport" value="10pin" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" />
         </item>
         <item name="Archery" icon="styles/standard/sport/archery.png" type="node,closedway">
@@ -3506,6 +3506,6 @@
             <label text="Edit Archery" />
             <key key="sport" value="archery" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" />
         </item>
         <item name="Athletics" icon="presets/athletics.png" type="node,closedway">
@@ -3513,6 +3513,6 @@
             <label text="Edit Athletics" />
             <key key="sport" value="athletics" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="track" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="track" />
         </item>
         <item name="Climbing" icon="styles/standard/sport/climbing.png" type="node,closedway">
@@ -3520,6 +3520,6 @@
             <label text="Edit Climbing" />
             <key key="sport" value="climbing" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="sports_centre" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="sports_centre" />
         </item>
         <item name="Canoeing" icon="presets/canoe.png" type="node,way,closedway">
@@ -3527,5 +3527,5 @@
             <label text="Edit Canoeing" />
             <key key="sport" value="canoe" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Cycling" icon="presets/cycling.png" type="node,closedway">
@@ -3533,6 +3533,6 @@
             <label text="Edit Cycling" />
             <key key="sport" value="cycling" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" />
         </item>
         <item name="Dog Racing" icon="styles/standard/leisure/dog.png" type="node,closedway">
@@ -3540,6 +3540,6 @@
             <label text="Edit Dog Racing" />
             <key key="sport" value="dog_racing" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" />
         </item>
         <item name="Equestrian" icon="presets/equestrian.png" type="node,closedway">
@@ -3547,6 +3547,6 @@
             <label text="Edit Equestrian" />
             <key key="sport" value="equestrian" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="horse_riding,pitch,sports_centre,stadium,track" default="horse_riding" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="horse_riding,pitch,sports_centre,stadium,track" default="horse_riding" />
         </item>
         <item name="Horse Racing" icon="presets/equestrian.png" type="node,closedway">
@@ -3554,6 +3554,6 @@
             <label text="Edit Horse Racing" />
             <key key="sport" value="horse_racing" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" />
         </item>
         <item name="Gymnastics" icon="presets/gymnastics.png" type="node,closedway">
@@ -3561,6 +3561,6 @@
             <label text="Edit Gymnastics" />
             <key key="sport" value="gymnastics" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" />
         </item>
         <item name="Skating" icon="presets/skating.png" type="node,closedway">
@@ -3569,6 +3569,6 @@
             <label text="Edit Skating" />
             <key key="sport" value="skating" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="ice_rink,pitch,sports_centre,stadium" default="ice_rink" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <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">
@@ -3577,6 +3577,6 @@
             <label text="Edit Skateboard" />
             <key key="sport" value="skateboard" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="pitch" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="pitch" />
         </item>
         <item name="Swimming" icon="presets/swimming.png" type="node,closedway">
@@ -3585,6 +3585,6 @@
             <label text="Edit Swimming" />
             <key key="sport" value="swimming" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="sports_centre,stadium,swimming_pool,water_park" default="swimming_pool" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="sports_centre,stadium,swimming_pool,water_park" default="swimming_pool" />
         </item>
         <item name="Skiing" icon="presets/skiing_downhill.png" type="node,way,closedway">
@@ -3592,8 +3592,8 @@
             <label text="Edit Skiing" />
             <key key="sport" value="skiing" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,snow_park" default="" delete_if_empty="true" />
-            <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" default="" delete_if_empty="true" />
-            <combo key="piste:grooming" text="Grooming" values="classic,mogul,skating,classic;skating,scooter,backcountry" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,snow_park" />
+            <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" />
+            <combo key="piste:grooming" text="Grooming" values="classic,mogul,skating,classic;skating,scooter,backcountry" />
         </item>
         <item name="Shooting" icon="presets/range.png" type="node,closedway">
@@ -3604,6 +3604,6 @@
             <label text="Edit Shooting" />
             <key key="sport" value="shooting" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" />
         </item>
     </group> <!-- Sport -->
@@ -3615,6 +3615,6 @@
             <label text="Edit Soccer" />
             <key key="sport" value="soccer" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Australian Football" icon="presets/soccer.png" type="node,closedway">
@@ -3622,6 +3622,6 @@
             <label text="Edit Australian Football" />
             <key key="sport" value="australian_football" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="American Football" icon="presets/football.png" type="node,closedway">
@@ -3629,6 +3629,6 @@
             <label text="Edit American Football" />
             <key key="sport" value="american_football" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Canadian Football" icon="presets/football.png" type="node,closedway">
@@ -3636,6 +3636,6 @@
             <label text="Edit Canadian Football" />
             <key key="sport" value="canadian_football" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Gaelic Football" icon="presets/soccer.png" type="node,closedway">
@@ -3643,6 +3643,6 @@
             <label text="Edit Gaelic Football" />
             <key key="sport" value="gaelic_football" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Rugby League" icon="presets/football.png" type="node,closedway">
@@ -3651,6 +3651,6 @@
             <label text="Edit Rugby League" />
             <key key="sport" value="rugby_league" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Rugby Union" icon="presets/football.png" type="node,closedway">
@@ -3659,6 +3659,6 @@
             <label text="Edit Rugby Union" />
             <key key="sport" value="rugby_union" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Baseball" icon="presets/baseball.png" type="node,closedway">
@@ -3666,6 +3666,6 @@
             <label text="Edit Baseball" />
             <key key="sport" value="baseball" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Basketball" icon="presets/basketball.png" type="node,closedway">
@@ -3673,6 +3673,6 @@
             <label text="Edit Basketball" />
             <key key="sport" value="basketball" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Volleyball" icon="styles/standard/sport/volleyball.png" type="node,closedway">         	
@@ -3681,7 +3681,7 @@
             <space />            
             <key key="sport" value="volleyball" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" /> 
-            <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" /> 
+            <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
         </item> 
         <item name="Beachvolleyball" icon="presets/beachvolleyball.png" type="node,closedway">
@@ -3690,7 +3690,7 @@
             <space />            
             <key key="sport" value="beachvolleyball" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" /> 
-            <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" /> 
+            <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
         </item> 
         <item name="Golf" icon="presets/golf.png" type="node,closedway">
@@ -3700,6 +3700,6 @@
             <label text="Edit Golf" />
             <key key="sport" value="golf" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="golf_course,pitch,sports_centre,stadium" default="golf_course" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <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">
@@ -3707,6 +3707,6 @@
             <label text="Edit Boule" />
             <key key="sport" value="boules" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Bowls" icon="presets/boule.png" type="node,closedway">
@@ -3714,6 +3714,6 @@
             <label text="Edit Bowls" />
             <key key="sport" value="bowls" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Cricket" icon="presets/cricket.png" type="node,closedway">
@@ -3721,6 +3721,6 @@
             <label text="Edit Cricket" />
             <key key="sport" value="cricket" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Cricket Nets" icon="presets/cricket.png" type="node,closedway">
@@ -3728,6 +3728,6 @@
             <label text="Edit Cricket Nets" />
             <key key="sport" value="cricket_nets" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" />
         </item>
         <item name="Croquet" icon="styles/standard/sport/croquet.png" type="node,closedway">
@@ -3735,6 +3735,6 @@
             <label text="Edit Croquet" />
             <key key="sport" value="croquet" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Hockey" icon="presets/Hockey.png" type="node,closedway">
@@ -3742,6 +3742,6 @@
             <label text="Edit Hockey" />
             <key key="sport" value="hockey" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="ice_rink,pitch,sports_centre,stadium" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="ice_rink,pitch,sports_centre,stadium" />
         </item>
         <item name="Pelota" icon="presets/pelota.png" type="node,closedway">
@@ -3750,6 +3750,6 @@
             <label text="Edit Pelota" />
             <key key="sport" value="pelota" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Racquet" icon="presets/racquetball.png" type="node,closedway">
@@ -3758,6 +3758,6 @@
             <label text="Edit Racquet" />
             <key key="sport" value="racquet" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" />
         </item>
         <item name="Table Tennis" icon="presets/table_tennis.png" type="node,closedway">
@@ -3765,6 +3765,6 @@
             <label text="Edit Table Tennis" />
             <key key="sport" value="table_tennis" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" />
         </item>
         <item name="Tennis" icon="presets/tennis.png" type="node,closedway">
@@ -3772,6 +3772,6 @@
             <label text="Edit Tennis" />
             <key key="sport" value="tennis" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
     </group> <!-- Sport (Ball) -->
@@ -3780,24 +3780,24 @@
             <label text="Edit Motorsport" />
             <key key="sport" value="motor" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" />
         </item>
         <item name="Karting" icon="presets/karting.png" type="node,closedway">
             <label text="Edit Karting" />
             <key key="sport" value="karting" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,track" />
         </item>
         <item name="Motocross" icon="styles/standard/sport/motocross.png" type="node,closedway">
             <label text="Edit Motocross" />
             <key key="sport" value="motocross" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,track" />
         </item>
         <item name="Safety Training" icon="presets/safety_training.png" type="node,closedway">
             <label text="Edit Safety Training" />
             <key key="sport" value="safety_training" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,track" />
         </item>
         <separator/>
@@ -3805,12 +3805,12 @@
             <label text="Edit Model Aerodrome" />
             <key key="sport" value="model_aerodrome" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,track" />
         </item>
         <item name="RC Car" icon="presets/car.png" type="node,closedway">
             <label text="Edit RC Car" />
             <key key="sport" value="rc_car" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,track" />
         </item>
     </group> <!-- Motorsport -->
@@ -3830,5 +3830,5 @@
             <label text="Edit Building" />
             <combo key="building" text="Building" values="yes,roof,garage,industrial,church,school,hangar,commercial,farm,transportation,greenhouse,office,university" default="yes" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Residential Building" icon="styles/standard/misc/landmark/building.png" type="node,closedway,relation">
@@ -3844,14 +3844,14 @@
             <label text="Edit Residential Building" />
             <combo key="building" text="Building" values="residential,apartments,house,hut,terrace,detached,roof" default="residential" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Tower" icon="presets/tower.png" type="node,closedway">
             <label text="Edit Tower" />
             <key key="man_made" value="tower" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
             <combo key="tower:type" text="Tower type" values="communication,observation" />
             <optional>
-                <text key="height" text="Height (meters)" delete_if_empty="true" />
-                <text key="operator" text="Operator" delete_if_empty="true" />
+                <text key="height" text="Height (meters)" />
+                <text key="operator" text="Operator" />
             </optional>
         </item>
@@ -3866,5 +3866,5 @@
             <label text="Edit Works" />
             <key key="man_made" value="works" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Chimney" icon="presets/chimney.png" type="node">
@@ -3873,7 +3873,7 @@
             <space />            
             <key key="man_made" value="chimney" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />            
-            <text key="height" text="Height (meters)" default="" delete_if_empty="true" />            
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />            
+            <text key="height" text="Height (meters)" />            
         </item>
         <item name="Windmill" icon="presets/windmill.png" type="node,closedway">
@@ -3884,10 +3884,10 @@
             <label text="Edit Windmill" />
             <key key="man_made" value="windmill" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Gasometer" icon="presets/gasometer.png" type="node,closedway">
             <label text="Edit Gasometer" />
             <key key="man_made" value="gasometer" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Pipeline" icon="presets/path.png" type="way">
@@ -3898,7 +3898,7 @@
             <label text="Edit Pipeline" />
             <key key="man_made" value="pipeline" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="type" text="Type" values="water,gas,heat,oil,sewage" default="" delete_if_empty="true" />
-            <combo key="location" text="Location" values="underground,underwater,overground" values_context="pipeline" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" />
+            <combo key="type" text="Type" values="water,gas,heat,oil,sewage" />
+            <combo key="location" text="Location" values="underground,underwater,overground" values_context="pipeline" />
         </item>
         <item name="Crane" icon="presets/crane.png" type="node,closedway">
@@ -3908,5 +3908,5 @@
             <label text="Edit Crane" />
             <key key="man_made" value="crane" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Mineshaft" icon="presets/mineshaft.png" type="node,closedway">
@@ -3916,11 +3916,11 @@
             <label text="Edit Mineshaft" />
             <key key="man_made" value="mineshaft" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="mineshaft_type" text="Function" values="winding,air" default="" delete_if_empty="true" />
-            <text key="depth" text="Depth in meters" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" default="" delete_if_empty="true" />
-            <combo key="headframe" text="Visible Headframe" values="yes,no" default="" delete_if_empty="true" />  
-            <check key="disused" text="Disused" default="off" delete_if_empty="true" />                                                             
+            <text key="name" text="Name" />
+            <combo key="mineshaft_type" text="Function" values="winding,air" />
+            <text key="depth" text="Depth in meters" />
+            <text key="operator" text="Operator" />
+            <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
+            <combo key="headframe" text="Visible Headframe" values="yes,no" />  
+            <check key="disused" text="Disused" default="off" />                                                             
         </item>
         <item name="Adit" icon="presets/adit.png" type="node">
@@ -3931,9 +3931,9 @@
             <label text="Edit Adit" />
             <key key="man_made" value="adit" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="length" text="Length in meters" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" default="" delete_if_empty="true" />
-            <check key="disused" text="Disused" default="off" delete_if_empty="true" />                                                             
+            <text key="name" text="Name" />
+            <text key="length" text="Length in meters" />
+            <text key="operator" text="Operator" />
+            <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
+            <check key="disused" text="Disused" default="off" />                                                             
         </item>
         <separator/>
@@ -3941,5 +3941,5 @@
             <label text="Edit Water Tower" />
             <key key="man_made" value="water_tower" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Water Works" icon="presets/water_works.png" type="node,closedway">
@@ -3950,6 +3950,6 @@
             <space />            
             <key key="man_made" value="water_works" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />            
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />            
         </item>              
         <item name="Wastewater Plant" icon="presets/wastewater_plant.png" type="node,closedway">
@@ -3962,5 +3962,5 @@
             <label text="Edit Wastewater Plant" />
             <key key="man_made" value="wastewater_plant" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Watermill" icon="styles/standard/misc/landmark/watermill.png" type="node">
@@ -3971,5 +3971,5 @@
             <space />            
             <key key="man_made" value="watermill" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>       
         <item name="Fountain" icon="presets/spring.png" type="node,closedway">
@@ -3983,5 +3983,5 @@
             <label text="Edit Fountain" />
             <key key="amenity" value="fountain" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Water Well" icon="presets/water_well.png" type="node">
@@ -3991,5 +3991,5 @@
             <label text="Edit Water Well" />
             <key key="man_made" value="water_well" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <separator/>
@@ -4001,5 +4001,5 @@
             <label text="Edit Lighthouse" />
             <key key="man_made" value="lighthouse" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node">
@@ -4009,5 +4009,5 @@
             <label text="Edit Beacon" />
             <key key="man_made" value="beacon" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Street Lamp" icon="styles/standard/misc/streetlamp.png" type="node">         	
@@ -4017,5 +4017,5 @@
             <space />            
             <key key="highway" value="street_lamp" />
-            <combo key="opening_hours" text="Operation times" values="Mo-Fr 22:00-05:00" default="" delete_if_empty="true" />                                                                                        
+            <combo key="opening_hours" text="Operation times" values="Mo-Fr 22:00-05:00" />                                                                                        
         </item> 
         <item name="Measurement Station" icon="presets/measurement_station.png" type="node,closedway">
@@ -4024,9 +4024,9 @@
             <space />            
             <key key="man_made" value="measurement_station" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />             
-            <combo key="measurement" text="Measurement" values="particulate_matter,seismic,water_level,weather" default="" delete_if_empty="true" />
-            <combo key="recording" text="Recording" values="manually,automated,remote,no" default="" delete_if_empty="true" />  
-            <combo key="display" text="Display" values="analog,digital,no" values_context="display" default="" delete_if_empty="true" />                                     
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />             
+            <combo key="measurement" text="Measurement" values="particulate_matter,seismic,water_level,weather" />
+            <combo key="recording" text="Recording" values="manually,automated,remote,no" />  
+            <combo key="display" text="Display" values="analog,digital,no" values_context="display" />                                     
        </item>                	
         <item name="Survey Point" icon="presets/survey_point.png" type="node">
@@ -4036,5 +4036,5 @@
             <label text="Edit Survey Point" />
             <key key="man_made" value="survey_point" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Surveillance" icon="presets/surveillance.png" type="node,closedway">
@@ -4044,6 +4044,6 @@
             <label text="Edit Surveillance Camera" />
             <key key="man_made" value="surveillance" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="surveillance" text="Type" values="indoor,outdoor,public" default="" />
+            <text key="name" text="Name" />
+            <combo key="surveillance" text="Type" values="indoor,outdoor,public" />
         </item>
     </group> <!-- Man Made -->
@@ -4058,18 +4058,18 @@
             <label text="Edit Power Generator" />
             <key key="power" value="generator" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="generator:source" text="Source" values="biofuel,biogas,biomass,coal,diesel,gas,gasoline,geothermal,hydro,nuclear,oil,osmotic,solar,tidal,waste,wave,wind" default="" delete_if_empty="true" />
-            <combo key="generator:method" text="Method" values="anaerobic_digestion,combustion,dam,fission,fusion,gasification,photovoltaic,pumped-storage,pumping,pyrolysis,run-of-the-river,thermal" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="generator:source" text="Source" values="biofuel,biogas,biomass,coal,diesel,gas,gasoline,geothermal,hydro,nuclear,oil,osmotic,solar,tidal,waste,wave,wind" />
+            <combo key="generator:method" text="Method" values="anaerobic_digestion,combustion,dam,fission,fusion,gasification,photovoltaic,pumped-storage,pumping,pyrolysis,run-of-the-river,thermal" />
             <space />
             <label text="Output forms of energy" />
-            <combo key="generator:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" delete_if_empty="true" />
-            <combo key="generator:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" delete_if_empty="true" />
-            <combo key="generator:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" delete_if_empty="true" />
-            <combo key="generator:output:cold_water" text="cold water" values="yes,2 W,3 kW,5 MW,7 GW" delete_if_empty="true" />
-            <combo key="generator:output:cold_air" text="cold air" values="yes,2 W,3 kW,5 MW,7 GW" delete_if_empty="true" />
-            <combo key="generator:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" delete_if_empty="true" />
-            <combo key="generator:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" delete_if_empty="true" />
-            <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" delete_if_empty="true" />
-            <combo key="generator:output:battery_charging" text="battery charging" values="yes,2 W,3 kW,5 MW,7 GW" delete_if_empty="true" />
+            <combo key="generator:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
+            <combo key="generator:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" />
+            <combo key="generator:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" />
+            <combo key="generator:output:cold_water" text="cold water" values="yes,2 W,3 kW,5 MW,7 GW" />
+            <combo key="generator:output:cold_air" text="cold air" values="yes,2 W,3 kW,5 MW,7 GW" />
+            <combo key="generator:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" />
+            <combo key="generator:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
+            <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
+            <combo key="generator:output:battery_charging" text="battery charging" values="yes,2 W,3 kW,5 MW,7 GW" />
         </item>
         <item name="Power Station" icon="presets/power.png" type="node,closedway">
@@ -4082,7 +4082,7 @@
             <label text="Edit Power Station" />
             <key key="power" value="station" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+            <text key="ref" text="Reference" />
         </item>
         <item name="Power Sub Station" icon="presets/power.png" type="node,closedway">
@@ -4094,6 +4094,6 @@
             <label text="Edit Power Sub Station" />
             <key key="power" value="sub_station" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <text key="ref" text="Line reference" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" />
+            <text key="ref" text="Line reference" />
         </item>
         <item name="Cable Distribution Cabinet" icon="presets/power.png" type="node">
@@ -4103,6 +4103,6 @@
             <label text="Edit Cable Distribution Cabinet" />
             <key key="power" value="cable_distribution_cabinet" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" />
+            <text key="ref" text="Reference" />
         </item>
         <separator/>
@@ -4117,5 +4117,5 @@
             <label text="Edit Power Tower" />
             <key key="power" value="tower" />
-            <text key="ref" text="Tower reference" default="" delete_if_empty="true" />
+            <text key="ref" text="Tower reference" />
         </item>
         <item name="Pole" icon="styles/standard/misc/landmark/power/pole.png" type="node">
@@ -4128,5 +4128,5 @@
             <label text="Edit Power Pole" />
             <key key="power" value="pole" />
-            <text key="ref" text="Pole reference" default="" delete_if_empty="true" />
+            <text key="ref" text="Pole reference" />
         </item>
         <item name="Power Line" icon="presets/power.png" type="way">
@@ -4134,11 +4134,11 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
             <label text="Edit Power Line" />
-            <combo key="power" text="Line type" values_context="Power Line" values="line,minor_line" default="line" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <text key="ref" text="Line reference" default="" delete_if_empty="true" />
+            <combo key="power" text="Line type" values_context="Power Line" values="line,minor_line" default="line" />
+            <text key="operator" text="Operator" />
+            <text key="ref" text="Line reference" />
             <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-            <combo key="voltage" text="Voltage" values="3000,10000,15000,20000,25000,110000,220000,380000" default="" delete_if_empty="true" />
-            <text key="cables" text="Amount of Cables" default="" delete_if_empty="true" />
-            <combo key="wires" text="Number of wires (better: conductors) per power cable" values="single,double,triple,quad" default="" delete_if_empty="true" />
+            <combo key="voltage" text="Voltage" values="3000,10000,15000,20000,25000,110000,220000,380000" />
+            <text key="cables" text="Amount of Cables" />
+            <combo key="wires" text="Number of wires (better: conductors) per power cable" values="single,double,triple,quad" />
         </item>
     </group> <!-- Power -->
@@ -4149,12 +4149,12 @@
             <label text="Edit Castle" />
             <key key="historic" value="castle" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="Ruins" icon="presets/ruins.png" type="node,closedway">
             <label text="Edit Ruins" />
             <key key="historic" value="ruins" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Archaeological Site" icon="styles/standard/sightseeing/archaeological.png" type="node,closedway">
@@ -4165,6 +4165,6 @@
             <label text="Edit Archaeological Site" />
             <key key="historic" value="archaeological_site" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway">
@@ -4173,5 +4173,5 @@
             <label text="Edit Battlefield" />
             <key key="historic" value="battlefield" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Palaeontological Site" icon="presets/palaeontological_site.png" type="node,closedway">
@@ -4179,5 +4179,5 @@
             <label text="Edit Palaeontological Site" />
             <key key="geological" value="palaeontological_site" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <separator/>
@@ -4185,5 +4185,5 @@
             <label text="Edit Monument" />
             <key key="historic" value="monument" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Memorial" icon="presets/memorial.png" type="node,closedway">
@@ -4192,20 +4192,20 @@
             <label text="Edit Memorial" />
             <key key="historic" value="memorial" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Wayside Cross" icon="presets/wayside_cross.png" type="node,closedway">
             <label text="Edit Wayside Cross" />
             <key key="historic" value="wayside_cross" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Wayside Shrine" icon="presets/wayside_shrine.png" type="node,closedway">
             <label text="Edit Wayside Shrine" />
             <key key="historic" value="wayside_shrine" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <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" />
             <key key="historic" value="boundary_stone" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
     </group> <!-- Historic Places -->
@@ -4216,6 +4216,6 @@
             <label text="Edit Supermarket" />
             <key key="shop" value="supermarket" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Convenience Store" icon="presets/convenience.png" type="node,closedway">
@@ -4225,6 +4225,6 @@
             <label text="Edit Convenience Store" />
             <key key="shop" value="convenience" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Kiosk" icon="presets/kiosk.png" type="node,closedway">
@@ -4236,6 +4236,6 @@
             <label text="Edit Kiosk" />
             <key key="shop" value="kiosk" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <separator/>
@@ -4250,6 +4250,6 @@
             <label text="Edit Baker" />
             <key key="shop" value="bakery" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Butcher" icon="presets/cow.png" type="node,closedway">
@@ -4262,6 +4262,6 @@
             <label text="Edit Butcher" />
             <key key="shop" value="butcher" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Seafood" icon="presets/seafood.png" type="node,closedway">
@@ -4271,7 +4271,7 @@
             <space />            
             <key key="shop" value="seafood" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />            
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
         </item>
         <item name="Deli (Fine Food)" icon="presets/deli.png" type="node,closedway">
@@ -4281,7 +4281,7 @@
             <space />            
             <key key="shop" value="deli" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />            
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
         </item>                     
         <item name="Confectionery" icon="presets/confectionery.png" type="node,closedway">
@@ -4292,6 +4292,6 @@
             <label text="Edit Confectionery" />
             <key key="shop" value="confectionery" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <separator/>
@@ -4307,7 +4307,7 @@
             <space />            
             <key key="amenity" value="marketplace" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />                      
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />                      
         </item>     	
         <item name="Greengrocer" icon="presets/greengrocer.png" type="node,closedway">
@@ -4319,7 +4319,7 @@
             <space />            
             <key key="shop" value="greengrocer" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />            
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
         </item>
         <separator/>
@@ -4340,12 +4340,12 @@
             <label text="Edit Alcohol Shop" />
             <key key="shop" value="alcohol" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Beverages" icon="styles/standard/shop/beverages.png" type="node,closedway">
             <label text="Edit Beverages Shop" />
             <key key="shop" value="beverages" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
     </group> <!-- Food -->
@@ -4354,6 +4354,6 @@
             <label text="Edit Clothes Shop" />
             <key key="shop" value="clothes" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Boutique" icon="presets/boutique.png" type="node,closedway">
@@ -4364,13 +4364,13 @@
             <space />            
             <key key="shop" value="boutique" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />            
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
         </item>            
          <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway">
             <label text="Edit Shoe Shop" />
             <key key="shop" value="shoes" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Outdoor" icon="presets/tent.png" type="node,closedway">
@@ -4380,12 +4380,12 @@
             <label text="Edit Outdoor Shop" />
             <key key="shop" value="outdoor" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Sports" icon="presets/rowing.png" type="node,closedway">
             <label text="Edit Sports Shop" />
             <key key="shop" value="sports" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <separator/>
@@ -4396,6 +4396,6 @@
             <label text="Edit Dry Cleaning" />
             <key key="shop" value="dry_cleaning" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Laundry" icon="presets/laundry.png" type="node,closedway">
@@ -4403,12 +4403,12 @@
             <label text="Edit Laundry" />
             <key key="shop" value="laundry" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Tailor" icon="styles/standard/shop/tailor.png" type="node,closedway">
             <label text="Edit Tailor" />
             <key key="shop" value="tailor" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Fabric" icon="presets/fabric.png" type="node,closedway">
@@ -4418,7 +4418,7 @@
             <space />            
             <key key="shop" value="fabric" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />            
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
         </item>                                                
     </group> <!-- Clothes -->
@@ -4427,12 +4427,12 @@
             <label text="Edit Computer Shop" />
             <key key="shop" value="computer" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway">
             <label text="Edit Electronics Shop" />
             <key key="shop" value="electronics" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Mobile Phone" icon="presets/mobile_phone.png" type="node,closedway">
@@ -4443,7 +4443,7 @@
             <space />            
             <key key="shop" value="mobile_phone" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />            
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
         </item>                                     
         <item name="Vacuum Cleaner" icon="presets/vacuum_cleaner.png" type="node,closedway">
@@ -4453,19 +4453,19 @@
             <space />            
             <key key="shop" value="vacuum_cleaner" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />            
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
         </item>        
         <item name="Hifi" icon="styles/standard/shop/hifi.png" type="node,closedway">
             <label text="Edit Hifi Shop" />
             <key key="shop" value="hifi" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Video" name_context="shop" icon="styles/standard/shop/video.png" type="node,closedway">
             <label text="Edit Video Shop" />
             <key key="shop" value="video" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
     </group> <!-- Electronic -->
@@ -4482,8 +4482,8 @@
             <label text="Edit Bank" />
             <key key="amenity" value="bank" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-            <check key="atm" text="Automated Teller Machine" default="on" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <check key="atm" text="Automated Teller Machine" default="on" />
         </item>
         <item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway">
@@ -4495,6 +4495,6 @@
             <label text="Edit Money Exchange" />
             <key key="amenity" value="bureau_de_change" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Automated Teller Machine" icon="styles/standard/money/atm.png" type="node">
@@ -4511,5 +4511,5 @@
             <label text="Edit Automated Teller Machine" />
             <key key="amenity" value="atm" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" />
         </item>
     </group> <!-- Cash -->
@@ -4523,7 +4523,7 @@
             <space />            
             <key key="shop" value="department_store" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />            
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
         </item>                                  
         <item name="Mall" icon="styles/standard/shop/mall.png" type="node,closedway">
@@ -4534,7 +4534,7 @@
             <space />            
             <key key="shop" value="mall" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />            
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
         </item>                                  
         <separator/>
@@ -4542,18 +4542,18 @@
             <label text="Edit Chemist" />
             <key key="shop" value="chemist" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Hairdresser" icon="styles/standard/shop/hairdresser.png" type="node,closedway">
             <label text="Edit Hairdresser" />
             <key key="shop" value="hairdresser" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway">
             <label text="Edit Optician" />
             <key key="shop" value="optician" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Jewelry" icon="styles/standard/shop/jewelry.png" type="node,closedway">
@@ -4563,7 +4563,7 @@
             <space />            
             <key key="shop" value="jewelry" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" /> 
+            <text key="name" text="Name" />            
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" /> 
         </item>                               
         <item name="Erotic" icon="presets/erotic.png" type="node,closedway">
@@ -4573,7 +4573,7 @@
             <space />            
             <key key="shop" value="erotic" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />            
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
         </item>                    
         <separator/>
@@ -4587,6 +4587,6 @@
             <label text="Edit Florist" />
             <key key="shop" value="florist" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Garden Centre" icon="styles/standard/shop/garden_centre.png" type="node,closedway">
@@ -4596,6 +4596,6 @@
             <label text="Edit Garden Centre" />
             <key key="shop" value="garden_centre" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <separator/>
@@ -4607,6 +4607,6 @@
             <label text="Edit Do-it-yourself-store" />
             <key key="shop" value="doityourself" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Hardware" icon="presets/hardware.png" type="node,closedway">
@@ -4615,6 +4615,6 @@
             <label text="Edit Hardware Store" />
             <key key="shop" value="hardware" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Paint" icon="presets/paint.png" type="node,closedway">
@@ -4624,7 +4624,7 @@
             <space />            
             <key key="shop" value="paint" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />            
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
         </item>                                       
         <separator/>
@@ -4632,6 +4632,6 @@
             <label text="Edit Furniture Shop" />
             <key key="shop" value="furniture" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Kitchen" icon="presets/kitchen.png" type="node,closedway">
@@ -4641,7 +4641,7 @@
             <space />            
             <key key="shop" value="kitchen" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />            
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
         </item>                   
         <item name="Curtain" icon="presets/curtain.png" type="node,closedway">
@@ -4651,7 +4651,7 @@
             <space />            
             <key key="shop" value="curtain" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />            
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
         </item>                     
         <item name="Frame" icon="presets/frame.png" type="node,closedway">
@@ -4661,7 +4661,7 @@
             <space />            
             <key key="shop" value="frame" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />            
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
         </item>                             
         <separator/>
@@ -4669,6 +4669,6 @@
             <label text="Edit Stationery Shop" />
             <key key="shop" value="stationery" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Copyshop" icon="presets/copyshop.png" type="node,closedway">
@@ -4678,13 +4678,13 @@
             <space />            
             <key key="shop" value="copyshop" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />            
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
         </item>
         <item name="Book Store" icon="presets/book.png" type="node,closedway">
             <label text="Edit Book Store" />
             <key key="shop" value="books" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <separator/>
@@ -4692,6 +4692,6 @@
             <label text="Edit Travel Agency" />
             <key key="shop" value="travel_agency" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Musical Instrument" icon="presets/musical_instrument.png" type="node,closedway">
@@ -4701,13 +4701,13 @@
             <space />            
             <key key="shop" value="musical_instrument" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />            
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
         </item>                                    
         <item name="Toys" icon="styles/standard/shop/toys.png" type="node,closedway">
             <label text="Edit Toy Shop" />
             <key key="shop" value="toys" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Variety Store" icon="presets/variety_store.png" type="node,closedway">
@@ -4717,7 +4717,7 @@
             <space />            
             <key key="shop" value="variety_store" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />            
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
         </item>
     </group> <!-- Other -->
@@ -4729,14 +4729,14 @@
         <label text="Edit Vending machine" />
         <key key="amenity" value="vending_machine" />
-        <multiselect key="vending" text="Vending products" values="animal_food;bicycle_tube;cigarettes;condoms;drinks;excrement_bags;food;news_papers;parking_tickets;photos;public_transport_plans;public_transport_tickets;SIM-cards;stamps;sweets;tampons;telephone_vouchers;toys;vouchers" default="" />
-        <text key="operator" text="Operator" default="" delete_if_empty="true" />
-        <text key="ref" text="Reference number" default="" delete_if_empty="true" />
-        <text key="note" text="Note" default="" delete_if_empty="true" />
-        <check key="payment:coins" text="Coins" default="off" delete_if_empty="true" />
-        <check key="payment:notes" text="Notes" default="off" delete_if_empty="true" />
-        <check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" delete_if_empty="true" />
-        <check key="payment:debit_cards" text="Debit cards" default="off" delete_if_empty="true" />
-        <check key="payment:credit_cards" text="Credit cards" default="off" delete_if_empty="true" />
-        <check key="payment:account_cards" text="Account or loyalty cards" default="off" delete_if_empty="true" />
+        <multiselect key="vending" text="Vending products" values="animal_food;bicycle_tube;cigarettes;condoms;drinks;excrement_bags;food;news_papers;parking_tickets;photos;public_transport_plans;public_transport_tickets;SIM-cards;stamps;sweets;tampons;telephone_vouchers;toys;vouchers" />
+        <text key="operator" text="Operator" />
+        <text key="ref" text="Reference number" />
+        <text key="note" text="Note" />
+        <check key="payment:coins" text="Coins" default="off" />
+        <check key="payment:notes" text="Notes" default="off" />
+        <check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" />
+        <check key="payment:debit_cards" text="Debit cards" default="off" />
+        <check key="payment:credit_cards" text="Credit cards" default="off" />
+        <check key="payment:account_cards" text="Account or loyalty cards" default="off" />
     </item>
   </group> <!-- Shops -->
@@ -4747,5 +4747,5 @@
             <space />
             <key key="boundary" value="national" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Administrative" icon="presets/boundaries.png" type="closedway,relation">
@@ -4753,5 +4753,5 @@
             <space />
             <key key="boundary" value="administrative" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Civil" icon="presets/boundaries.png" type="closedway,relation">
@@ -4759,5 +4759,5 @@
             <space />
             <key key="boundary" value="civil" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Political" icon="presets/boundaries.png" type="closedway,relation">
@@ -4765,5 +4765,5 @@
             <space />
             <key key="boundary" value="political" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="National park" icon="presets/boundaries.png" type="closedway,relation">
@@ -4771,5 +4771,5 @@
             <space />
             <key key="boundary" value="national_park" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
     </group> <!-- Boundaries -->
@@ -4779,6 +4779,6 @@
             <space />
             <key key="place" value="continent" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="Country" icon="presets/places.png" type="node,closedway">
@@ -4786,6 +4786,6 @@
             <space />
             <key key="place" value="country" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="State" icon="presets/places.png" type="node,closedway">
@@ -4793,6 +4793,6 @@
             <space />
             <key key="place" value="state" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="Region" icon="presets/places.png" type="node,closedway">
@@ -4800,6 +4800,6 @@
             <space />
             <key key="place" value="region" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="County" icon="presets/places.png" type="node,closedway">
@@ -4807,9 +4807,9 @@
             <space />
             <key key="place" value="county" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
-            <text key="population" text="Population" default="" delete_if_empty="true" />
-            <text key="addr:postcode" text="Post code" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="wikipedia" text="Wikipedia" />
+            <text key="population" text="Population" />
+            <text key="addr:postcode" text="Post code" />
+            <text key="website" text="Website" />
         </item>
         <separator/>
@@ -4818,9 +4818,9 @@
             <space />
             <key key="place" value="city" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
-            <text key="population" text="Population" default="" delete_if_empty="true" />
-            <text key="addr:postcode" text="Post code" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="wikipedia" text="Wikipedia" />
+            <text key="population" text="Population" />
+            <text key="addr:postcode" text="Post code" />
+            <text key="website" text="Website" />
         </item>
         <item name="Town" icon="presets/places.png" type="node,closedway">
@@ -4831,9 +4831,9 @@
             <space />
             <key key="place" value="town" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
-            <text key="population" text="Population" default="" delete_if_empty="true" />
-            <text key="addr:postcode" text="Post code" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="wikipedia" text="Wikipedia" />
+            <text key="population" text="Population" />
+            <text key="addr:postcode" text="Post code" />
+            <text key="website" text="Website" />
         </item>
         <item name="Suburb" icon="presets/places.png" type="node,closedway">
@@ -4843,9 +4843,9 @@
             <space />
             <key key="place" value="suburb" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
-            <text key="population" text="Population" default="" delete_if_empty="true" />
-            <text key="addr:postcode" text="Post code" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="wikipedia" text="Wikipedia" />
+            <text key="population" text="Population" />
+            <text key="addr:postcode" text="Post code" />
+            <text key="website" text="Website" />
         </item>
         <item name="Village" icon="presets/places.png" type="node,closedway">
@@ -4853,9 +4853,9 @@
             <space />
             <key key="place" value="village" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
-            <text key="population" text="Population" default="" delete_if_empty="true" />
-            <text key="addr:postcode" text="Post code" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="wikipedia" text="Wikipedia" />
+            <text key="population" text="Population" />
+            <text key="addr:postcode" text="Post code" />
+            <text key="website" text="Website" />
         </item>
         <item name="Hamlet" icon="presets/places.png" type="node,closedway">
@@ -4863,9 +4863,9 @@
             <space />
             <key key="place" value="hamlet" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
-            <text key="population" text="Population" default="" delete_if_empty="true" />
-            <text key="addr:postcode" text="Post code" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="wikipedia" text="Wikipedia" />
+            <text key="population" text="Population" />
+            <text key="addr:postcode" text="Post code" />
+            <text key="website" text="Website" />
         </item>
         <item name="Isolated Dwelling" icon="presets/places.png" type="node,closedway">
@@ -4873,9 +4873,9 @@
             <space />
             <key key="place" value="isolated_dwelling" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
-            <text key="population" text="Population" default="" delete_if_empty="true" />
-            <text key="addr:postcode" text="Post code" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="wikipedia" text="Wikipedia" />
+            <text key="population" text="Population" />
+            <text key="addr:postcode" text="Post code" />
+            <text key="website" text="Website" />
         </item>
         <item name="Neighbourhood" icon="presets/places.png" type="node,closedway">
@@ -4884,8 +4884,8 @@
             <space />
             <key key="place" value="neighbourhood" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
-            <text key="population" text="Population" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="wikipedia" text="Wikipedia" />
+            <text key="population" text="Population" />
+            <text key="website" text="Website" />
         </item>
         <separator/>
@@ -4896,6 +4896,6 @@
             <space />
             <key key="place" value="locality" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="wikipedia" text="Wikipedia" />
         </item>
     </group> <!-- Places -->
@@ -4906,7 +4906,7 @@
             <label text="Edit Peak" />
             <key key="natural" value="peak" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ele" text="Elevation" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="ele" text="Elevation" />
+            <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="Glacier" icon="presets/glacier.png" type="node,closedway">
@@ -4914,7 +4914,7 @@
             <label text="Edit Glacier" />
             <key key="natural" value="glacier" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ele" text="Elevation" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="ele" text="Elevation" />
+            <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="Volcano" icon="presets/volcano.png" type="node,closedway">
@@ -4923,7 +4923,7 @@
             <label text="Edit Volcano" />
             <key key="natural" value="volcano" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ele" text="Elevation" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="ele" text="Elevation" />
+            <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="Cave Entrance" icon="presets/cave_entrance.png" type="node,closedway">
@@ -4932,6 +4932,6 @@
             <label text="Edit Cave Entrance" />
             <key key="natural" value="cave_entrance" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="wikipedia" text="Wikipedia" />
         </item>
         <separator/>
@@ -4944,6 +4944,6 @@
             <space />
             <key key="place" value="island" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="Islet" icon="presets/islet.png" type="node,closedway">
@@ -4953,6 +4953,6 @@
             <space />
             <key key="place" value="islet" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="wikipedia" text="Wikipedia" />
         </item>
     </group> <!-- Geography -->
@@ -4967,8 +4967,8 @@
             <label text="Edit Tree" />
             <key key="natural" value="tree" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="type" text="Type" default="" delete_if_empty="true" />
-            <text key="height" text="Height" default="" delete_if_empty="true" />
-            <text key="name:botanical" text="Botanical Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <text key="type" text="Type" />
+            <text key="height" text="Height" />
+            <text key="name:botanical" text="Botanical Name" />
         </item>
         <item name="Wood" icon="presets/landuse.png" type="node,closedway,relation">
@@ -4979,6 +4979,6 @@
             <label text="Edit Wood" />
             <key key="natural" value="wood" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="wood" text="Type" values="coniferous,deciduous,mixed" values_context="wood" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="wood" text="Type" values="coniferous,deciduous,mixed" values_context="wood" />
         </item>
         <item name="Forest" icon="presets/landuse.png" type="node,closedway,relation">
@@ -4991,11 +4991,11 @@
             <space />
             <key key="landuse" value="forest" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="wood" text="Type" values="coniferous,deciduous,mixed" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="wood" text="Type" values="coniferous,deciduous,mixed" />
         </item>
         <item name="Nature Reserve" icon="styles/standard/leisure/nature_reserve.png" type="node,closedway,relation">
             <label text="Edit Nature Reserve" />
             <key key="leisure" value="nature_reserve" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <separator/>
@@ -5003,5 +5003,5 @@
             <label text="Edit Scree" />
             <key key="natural" value="scree" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Fell" icon="presets/empty.png" type="node,closedway,relation">
@@ -5011,10 +5011,10 @@
             <label text="Edit Fell" />
             <key key="natural" value="fell" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Scrub" icon="presets/empty.png" type="node,closedway,relation">
             <label text="Edit Scrub" />
             <key key="natural" value="scrub" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Heath" icon="presets/empty.png" type="node,closedway,relation">
@@ -5024,5 +5024,5 @@
             <label text="Edit Heath" />
             <key key="natural" value="heath" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
     </group> <!-- Nature -->
@@ -5035,5 +5035,5 @@
             <space />
             <key key="landuse" value="farmyard" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Farmland" icon="presets/landuse.png" type="closedway,relation">
@@ -5041,5 +5041,5 @@
             <space />
             <key key="landuse" value="farmland" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Meadow" icon="presets/landuse.png" type="node,closedway,relation">
@@ -5047,5 +5047,5 @@
             <space />
             <key key="landuse" value="meadow" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Vineyard" icon="presets/fruits.png" type="node,closedway,relation">
@@ -5053,5 +5053,5 @@
             <space />
             <key key="landuse" value="vineyard" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Greenhouse Horticulture" icon="presets/greenhouse_horticulture.png" type="closedway">
@@ -5061,6 +5061,6 @@
             <space />            
             <key key="landuse" value="greenhouse_horticulture" />
-            <text key="name" text="Name" default="" delete_if_empty="true" /> 
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />                                                                
+            <text key="name" text="Name" /> 
+            <text key="operator" text="Operator" />                                                                
         </item>        
         <item name="Allotments" icon="presets/landuse.png" type="node,closedway,relation">
@@ -5068,5 +5068,5 @@
             <space />
             <key key="landuse" value="allotments" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <separator/>
@@ -5074,5 +5074,5 @@
             <label text="Edit Garden" />
             <key key="leisure" value="garden" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Grass" icon="presets/landuse.png" type="node,closedway,relation">
@@ -5080,5 +5080,5 @@
             <space />
             <key key="landuse" value="grass" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Village Green" icon="presets/landuse.png" type="node,closedway,relation">
@@ -5088,5 +5088,5 @@
             <space />
             <key key="landuse" value="village_green" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Common" icon="presets/empty.png" type="node,closedway,relation">
@@ -5095,10 +5095,10 @@
             <label text="Edit Common" />
             <key key="leisure" value="common" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Park" icon="presets/empty.png" type="node,closedway,relation">
             <label text="Edit Park" />
             <key key="leisure" value="park" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Recreation Ground" icon="presets/landuse.png" type="node,closedway,relation">
@@ -5109,5 +5109,5 @@
             <space />
             <key key="landuse" value="recreation_ground" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <separator/>
@@ -5116,5 +5116,5 @@
             <space />
             <key key="landuse" value="residential" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Graveyard" icon="presets/graveyard.png" type="node,closedway,relation">
@@ -5125,7 +5125,7 @@
             <label text="Edit Graveyard" />
             <key key="amenity" value="grave_yard" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" default="" delete_if_empty="true" />
-            <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
+            <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">
@@ -5138,7 +5138,7 @@
             <space />
             <key key="landuse" value="cemetery" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" default="" delete_if_empty="true" />
-            <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
+            <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">
@@ -5146,5 +5146,5 @@
             <space />
             <key key="landuse" value="retail" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Commercial" icon="presets/empty.png" type="node,closedway,relation">
@@ -5152,5 +5152,5 @@
             <space />
             <key key="landuse" value="commercial" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Industrial" icon="presets/works.png" type="node,closedway,relation">
@@ -5158,5 +5158,5 @@
             <space />
             <key key="landuse" value="industrial" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Garages" icon="presets/garages.png" type="closedway">
@@ -5169,6 +5169,6 @@
             <space />            
             <key key="landuse" value="garages" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />                                                    
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />                                                    
+            <text key="operator" text="Operator" />
         </item> 
         <item name="Railway land" icon="presets/rail_light.png" type="closedway,relation">
@@ -5179,5 +5179,5 @@
             <space />
             <key key="landuse" value="railway" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Military" icon="presets/military.png" type="node,closedway,relation">
@@ -5185,5 +5185,5 @@
             <space />
             <key key="landuse" value="military" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <separator/>
@@ -5192,5 +5192,5 @@
             <space />
             <key key="landuse" value="construction" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Brownfield" icon="presets/landuse.png" type="node,closedway,relation">
@@ -5198,5 +5198,5 @@
             <space />
             <key key="landuse" value="brownfield" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Greenfield" icon="presets/landuse.png" type="node,closedway,relation">
@@ -5204,5 +5204,5 @@
             <space />
             <key key="landuse" value="greenfield" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Landfill" icon="presets/landuse.png" type="node,closedway,relation">
@@ -5210,5 +5210,5 @@
             <space />
             <key key="landuse" value="landfill" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
         <item name="Quarry" icon="presets/mine.png" type="node,closedway,relation">
@@ -5216,5 +5216,5 @@
             <space />
             <key key="landuse" value="quarry" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
         </item>
     </group> <!-- Landuse -->
@@ -5226,11 +5226,11 @@
             <label text="Edit Address Information" />
             <space />
-            <text key="addr:housenumber" text="House number" default="" delete_if_empty="true" />
-            <optional>
-                <text key="addr:housename" text="House name" default="" delete_if_empty="true" />
-                <text key="addr:street" text="Street name" use_last_as_default="force" delete_if_empty="true" />
-                <text key="addr:city" text="City name" use_last_as_default="force" delete_if_empty="true" />
-                <text key="addr:postcode" text="Post code" use_last_as_default="force" delete_if_empty="true" />
-                <combo key="addr:country" text="Country code" values="AT,CH,DE,FR,GB,IT,US" use_last_as_default="force" delete_if_empty="true" />
+            <text key="addr:housenumber" text="House number" />
+            <optional>
+                <text key="addr:housename" text="House name" />
+                <text key="addr:street" text="Street name" use_last_as_default="force" />
+                <text key="addr:city" text="City name" use_last_as_default="force" />
+                <text key="addr:postcode" text="Post code" use_last_as_default="force" />
+                <combo key="addr:country" text="Country code" values="AT,CH,DE,FR,GB,IT,US" use_last_as_default="force" />
             </optional>
         </item>
@@ -5245,24 +5245,24 @@
             <label text="Edit Contact information" />
             <space />
-            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
-            <space />
-            <text key="website" text="Website" default="" delete_if_empty="true" />
-            <text key="email" text="Email Address" default="" delete_if_empty="true" />
-            <space />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
-            <text key="image" text="Image" default="" delete_if_empty="true" />
+            <text key="phone" text="Phone Number" />
+            <text key="fax" text="Fax Number" />
+            <space />
+            <text key="website" text="Website" />
+            <text key="email" text="Email Address" />
+            <space />
+            <text key="wikipedia" text="Wikipedia" />
+            <text key="image" text="Image" />
         </item>
         <item name="Contact (schema with 'contact:*' prefix)" icon="presets/contact.png" type="node,way,closedway,relation">
             <label text="Edit Contact information (new schema)" />
             <space />
-            <text key="contact:phone" text="Phone Number" default="" delete_if_empty="true" />
-            <text key="contact:fax" text="Fax Number" default="" delete_if_empty="true" />
-            <space />
-            <text key="contact:website" text="Website" default="" delete_if_empty="true" />
-            <text key="contact:email" text="Email Address" default="" delete_if_empty="true" />
-            <space />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
-            <text key="image" text="Image" default="" delete_if_empty="true" />
+            <text key="contact:phone" text="Phone Number" />
+            <text key="contact:fax" text="Fax Number" />
+            <space />
+            <text key="contact:website" text="Website" />
+            <text key="contact:email" text="Email Address" />
+            <space />
+            <text key="wikipedia" text="Wikipedia" />
+            <text key="image" text="Image" />
         </item>
     </group> <!-- Annotation -->
@@ -5279,5 +5279,5 @@
             <key key="type" value="multipolygon" />
             <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
+                <text key="name" text="Name" />
             </optional>
             <roles>
@@ -5295,8 +5295,8 @@
             <label text="Edit Boundary" />
             <key key="type" value="boundary" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <optional>
-                <combo key="boundary" text="Boundary type" values="administrative,national,civil,political" default="" delete_if_empty="true" />
-                <combo key="admin_level" text="Administrative level" values="1,2,3,4,5,6,7,8,9,10" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <optional>
+                <combo key="boundary" text="Boundary type" values="administrative,national,civil,political" />
+                <combo key="admin_level" text="Administrative level" values="1,2,3,4,5,6,7,8,9,10" />
             </optional>
             <roles>
@@ -5312,5 +5312,5 @@
             <label text="Edit Site" />
             <key key="type" value="site" />
-            <text key="name" text="Site name" default="" delete_if_empty="true" />
+            <text key="name" text="Site name" />
             <roles>
                 <role key="label" text="where to place the label" requisite="optional" type="node" />
@@ -5331,7 +5331,7 @@
             <label text="Edit Turn Restriction" />
             <key key="type" value="restriction" />
-            <combo key="restriction" text="Restriction" values="no_left_turn,no_right_turn,no_straight_on,no_u_turn,only_right_turn,only_left_turn,only_straight_on" default="" delete_if_empty="true" />
-            <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="restriction" text="Restriction" values="no_left_turn,no_right_turn,no_straight_on,no_u_turn,only_right_turn,only_left_turn,only_straight_on" />
+            <optional>
+                <text key="name" text="Name" />
             </optional>
             <roles>
@@ -5345,8 +5345,8 @@
             <label text="Edit Enforcement" />
             <key key="type" value="enforcement" />
-            <combo key="enforcement" text="Type of enforcement" values="maxheight,maxweight,maxspeed,mindistance,traffic_signals,check " default="" delete_if_empty="true" />
-            <text key="maxheight" text="Max. height (meters, only if enforcement=maxheight)" default="" delete_if_empty="true" />
-            <text key="maxweight" text="Max. weight (tonnes, only if enforcement=maxweight)" default="" delete_if_empty="true" />
-            <text key="maxspeed" text="Max. speed (km/h, only if enforcement=maxspeed)" default="" delete_if_empty="true" />
+            <combo key="enforcement" text="Type of enforcement" values="maxheight,maxweight,maxspeed,mindistance,traffic_signals,check " />
+            <text key="maxheight" text="Max. height (meters, only if enforcement=maxheight)" />
+            <text key="maxweight" text="Max. weight (tonnes, only if enforcement=maxweight)" />
+            <text key="maxspeed" text="Max. speed (km/h, only if enforcement=maxspeed)" />
             <roles>
                 <role key="device" text="location of enforcement device" requisite="required" type="node,way,closedway" />
@@ -5367,16 +5367,16 @@
             <label text="Edit Route" />
             <key key="type" value="route" />
-            <combo key="route" text="Route type" values="bicycle,bus,road,ferry,ski,foot,hiking,tram,detour,railway,subway" default="" delete_if_empty="true" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference" default="" delete_if_empty="true" />
-            <text key="symbol" text="Symbol description" default="" delete_if_empty="true" />
-            <text key="description" text="Description" default="" delete_if_empty="true" />
-            <optional>
-                <text key="from" text="From (initial stop)" default="" delete_if_empty="true" />
-                <text key="to" text="To (terminal stop)" default="" delete_if_empty="true" />
-                <text key="network" text="Network" default="" delete_if_empty="true" />
-                <text key="operator" text="Operator" default="" delete_if_empty="true" />
-                <combo key="state" text="Route state" values="proposed,alternate,temporary,connection" default="" delete_if_empty="true" />
-                <text key="color" text="Color (hex)" default="" delete_if_empty="true" />
+            <combo key="route" text="Route type" values="bicycle,bus,road,ferry,ski,foot,hiking,tram,detour,railway,subway" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference" />
+            <text key="symbol" text="Symbol description" />
+            <text key="description" text="Description" />
+            <optional>
+                <text key="from" text="From (initial stop)" />
+                <text key="to" text="To (terminal stop)" />
+                <text key="network" text="Network" />
+                <text key="operator" text="Operator" />
+                <combo key="state" text="Route state" values="proposed,alternate,temporary,connection" />
+                <text key="color" text="Color (hex)" />
             </optional>
             <roles>
@@ -5394,11 +5394,11 @@
             <label text="Edit Route master" />
             <key key="type" value="route_master" />
-            <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" default="" delete_if_empty="true" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference" default="" delete_if_empty="true" />
-            <optional>
-                <text key="network" text="Network" default="" delete_if_empty="true" />
-                <text key="operator" text="Operator" default="" delete_if_empty="true" />
-                <text key="color" text="Color (hex)" default="" delete_if_empty="true" />
+            <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference" />
+            <optional>
+                <text key="network" text="Network" />
+                <text key="operator" text="Operator" />
+                <text key="color" text="Color (hex)" />
             </optional>
             <roles>
@@ -5416,14 +5416,14 @@
             <label text="Edit Directional Route (used in North America)" />
             <key key="type" value="route" />
-            <combo key="route" text="Route type" values="bicycle,bus,road,ferry,ski,foot,hiking,tram,detour,railway,subway" default="" delete_if_empty="true" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference" default="" delete_if_empty="true" />
-            <text key="symbol" text="Symbol description" default="" delete_if_empty="true" />
-            <text key="description" text="Description" default="" delete_if_empty="true" />
-            <optional>
-                <text key="network" text="Network" default="" delete_if_empty="true" />
-                <text key="operator" text="Operator" default="" delete_if_empty="true" />
-                <combo key="state" text="Route state" values="proposed,alternate,temporary,connection" default="" delete_if_empty="true" />
-                <text key="color" text="Color (hex)" default="" delete_if_empty="true" />
+            <combo key="route" text="Route type" values="bicycle,bus,road,ferry,ski,foot,hiking,tram,detour,railway,subway" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference" />
+            <text key="symbol" text="Symbol description" />
+            <text key="description" text="Description" />
+            <optional>
+                <text key="network" text="Network" />
+                <text key="operator" text="Operator" />
+                <combo key="state" text="Route state" values="proposed,alternate,temporary,connection" />
+                <text key="color" text="Color (hex)" />
             </optional>
             <roles>
@@ -5442,8 +5442,8 @@
             <label text="Edit route network" />
             <key key="type" value="network" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <optional>
-                <text key="network" text="Network" default="" delete_if_empty="true" />
-                <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
+            <optional>
+                <text key="network" text="Network" />
+                <text key="operator" text="Operator" />
             </optional>
             <roles>
@@ -5456,5 +5456,5 @@
             <label text="Edit associated street" />
             <key key="type" value="associatedStreet" />
-            <text key="name" text="Street name" default="" delete_if_empty="true" />
+            <text key="name" text="Street name" />
             <roles>
                 <role key="street" text="street" requisite="required" type="way" />
@@ -5466,5 +5466,5 @@
             <label text="Edit Street" />
             <key key="type" value="street" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="name" text="Name" />
             <roles>
                 <role key="street" text="ways being part of street" requisite="required" type="way" />
@@ -5478,10 +5478,10 @@
             <label text="Edit Destination sign" />
             <key key="type" value="destination_sign" />
-            <text key="destination" text="Destination written on sign (w/o distance)" default="" delete_if_empty="true" />
-            <text key="distance" text="Distance (km)" default="" delete_if_empty="true" />
-            <text key="time" text="Time (hh:mm, for trekking)" default="" delete_if_empty="true" />
-            <text key="colour:back" text="Colour of background" default="" delete_if_empty="true" />
-            <text key="colour:text" text="Colour of text" default="" delete_if_empty="true" />
-            <text key="colour:arrow" text="Colour of border/arrow" default="" delete_if_empty="true" />
+            <text key="destination" text="Destination written on sign (w/o distance)" />
+            <text key="distance" text="Distance (km)" />
+            <text key="time" text="Time (hh:mm, for trekking)" />
+            <text key="colour:back" text="Colour of background" />
+            <text key="colour:text" text="Colour of text" />
+            <text key="colour:arrow" text="Colour of border/arrow" />
             <roles>
                 <role key="from" text="last way before junction" requisite="optional" type="node,way" />
@@ -5496,15 +5496,15 @@
             <label text="Edit Waterway" />
             <key key="type" value="waterway" />
-            <combo key="waterway" text="Subtype of waterway (largest one of members)" values="river,stream,canal,drain,ditch" default="" delete_if_empty="true" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <optional>
-                <text key="destination" text="Name of river/sea/ocean" default="" delete_if_empty="true" />
-                <text key="ref" text="Reference" default="" delete_if_empty="true" />
-                <text key="ref:sandre" text="Reference Sandre (FR)" default="" delete_if_empty="true" />
-                <text key="ref:fgkz" text="Reference FGKZ (DE)" default="" delete_if_empty="true" />
-                <text key="ref:regine" text="Reference REGINE (NO)" default="" delete_if_empty="true" />
-                <text key="ref:gnis" text="Reference GNIS (USA)" default="" delete_if_empty="true" />
-                <text key="ref:gnbc" text="Reference GNBC (CA)" default="" delete_if_empty="true" />
-                <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+            <combo key="waterway" text="Subtype of waterway (largest one of members)" values="river,stream,canal,drain,ditch" />
+            <text key="name" text="Name" />
+            <optional>
+                <text key="destination" text="Name of river/sea/ocean" />
+                <text key="ref" text="Reference" />
+                <text key="ref:sandre" text="Reference Sandre (FR)" />
+                <text key="ref:fgkz" text="Reference FGKZ (DE)" />
+                <text key="ref:regine" text="Reference REGINE (NO)" />
+                <text key="ref:gnis" text="Reference GNIS (USA)" />
+                <text key="ref:gnbc" text="Reference GNBC (CA)" />
+                <text key="wikipedia" text="Wikipedia" />
             </optional>
             <roles>
@@ -5518,10 +5518,10 @@
             <label text="Edit Bridge" />
             <key key="type" value="bridge" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference" default="" delete_if_empty="true" />
-            <text key="height" text="Height (meters)" default="" delete_if_empty="true" />
-            <text key="length" text="Length (meters)" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference" />
+            <text key="height" text="Height (meters)" />
+            <text key="length" text="Length (meters)" />
+            <text key="operator" text="Operator" />
             <roles>
                 <role key="across" text="ways supported by (on top of) the bridge" requisite="optional" type="way" />
@@ -5535,9 +5535,9 @@
             <label text="Edit Tunnel" />
             <key key="type" value="tunnel" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference" default="" delete_if_empty="true" />
-            <text key="length" text="Length (meters)" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference" />
+            <text key="length" text="Length (meters)" />
+            <text key="operator" text="Operator" />
             <roles>
                 <role key="through" text="ways passing through the tunnel" requisite="required" type="way" />