Index: data/defaultpresets.xml
===================================================================
--- data/defaultpresets.xml	(revision 6306)
+++ data/defaultpresets.xml	(working copy)
@@ -159,7 +159,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=motorway"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=motorway" />
             <label text="Edit Motorway" />
-            <space />
+            <space/>
             <key key="highway" value="motorway" />
             <text key="ref" text="Reference" />
             <optional>
@@ -217,7 +217,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=trunk"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=trunk" />
             <label text="Edit Trunk" />
-            <space />
+            <space/>
             <key key="highway" value="trunk" />
             <text key="ref" text="Reference" />
             <optional>
@@ -245,9 +245,9 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Link_(highway)"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Link_(highway)"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Link_(highway)"
-                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)"/>
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)" />
             <label text="Edit Trunk Link" />
-            <space />
+            <space/>
             <key key="highway" value="trunk_link" />
             <text key="ref" text="Reference" />
             <optional>
@@ -277,7 +277,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=primary"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=primary" />
             <label text="Edit Primary Road" />
-            <space />
+            <space/>
             <key key="highway" value="primary" />
             <text key="ref" text="Reference" />
             <optional>
@@ -303,7 +303,7 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Link_(highway)"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Link_(highway)"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Link_(highway)"
-                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)"/>
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)" />
             <label text="Edit Primary Link" />
             <key key="highway" value="primary_link" />
             <optional>
@@ -331,7 +331,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=secondary"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=secondary" />
             <label text="Edit Secondary Road" />
-            <space />
+            <space/>
             <key key="highway" value="secondary" />
             <text key="ref" text="Reference" />
             <optional>
@@ -356,7 +356,7 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Link_(highway)"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Link_(highway)"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Link_(highway)"
-                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)"/>
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)" />
             <label text="Edit Secondary Link" />
             <key key="highway" value="secondary_link" />
             <optional>
@@ -384,7 +384,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=tertiary"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=tertiary" />
             <label text="Edit Tertiary Road" />
-            <space />
+            <space/>
             <key key="highway" value="tertiary" />
             <text key="ref" text="Reference" />
             <optional>
@@ -409,7 +409,7 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Link_(highway)"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Link_(highway)"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Link_(highway)"
-                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)"/>
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)" />
             <label text="Edit Tertiary Link" />
             <key key="highway" value="tertiary_link" />
             <optional>
@@ -465,7 +465,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=residential"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=residential" />
             <label text="Edit Residential Street" />
-            <space />
+            <space/>
             <key key="highway" value="residential" />
             <text key="name" text="Name" />
             <optional>
@@ -487,13 +487,13 @@
             <link href="http://wiki.openstreetmap.org/wiki/Key:bicycle_road"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bicycle_road" />
             <label text="Edit Bicycle Road" />
-            <space />
+            <space/>
             <key key="bicycle_road" value="yes" />
             <key key="bicycle" value="designated" />
             <combo key="highway" text="Highway type" values="residential,service,unclassified,path,cycleway" values_context="Highway" default="residential" />
             <text key="name" text="Name" />
             <combo key="vehicle" text="Vehicle access" values="yes,no,destination" default="no" />
-            <text key="maxspeed" text="Max. speed (km/h)" default="30"/>
+            <text key="maxspeed" text="Max. speed (km/h)" default="30" />
             <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" />
@@ -517,7 +517,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=living_street"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=living_street" />
             <label text="Edit Living Street" />
-            <space />
+            <space/>
             <key key="highway" value="living_street" />
             <text key="name" text="Name" />
             <optional>
@@ -545,7 +545,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=pedestrian"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=pedestrian" />
             <label text="Edit Pedestrian Street" />
-            <space />
+            <space/>
             <key key="highway" value="pedestrian" />
             <text key="name" text="Name" />
             <optional>
@@ -572,7 +572,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=service"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=service" />
             <label text="Edit Service Way" />
-            <space />
+            <space/>
             <key key="highway" value="service" />
             <combo key="service" text="Service way type" values="alley,driveway,parking_aisle,drive-through" />
             <optional>
@@ -675,17 +675,17 @@
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Key:access"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:access" />
             <label text="Edit Road Restrictions" />
-            <space />
+            <space/>
             <check key="oneway" text="Oneway" default="off" />
             <check key="toll" text="Toll" default="off"  />
             <check key="noexit" text="No exit (cul-de-sac)" default="off"  />
             <label text="Transport mode restrictions" />
-            <space />
+            <space/>
             <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" match="key" />
             <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" />
             <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" />
             <label text="Vehicles per type" />
-            <space />
+            <space/>
             <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
             <combo key="bicycle" text="Bicycle" values="yes,official,designated,dismount,permissive,destination,delivery,private,no" match="key" />
             <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
@@ -694,7 +694,7 @@
             <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
             <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
             <label text="Vehicles per use" />
-            <space />
+            <space/>
             <combo key="agricultural" text="Agricultural" values="yes,official,designated,destination,permissive,private,no" match="key" />
             <combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,permissive,private,no" match="keyvalue" />
             <combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,private,no" match="key" />
@@ -721,7 +721,7 @@
                   ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:junction=roundabout" />
             <label text="Edit Junction" />
-            <space />
+            <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" />
             <optional>
@@ -748,7 +748,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:bridge"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:bridge" />
             <label text="Edit Bridge" />
-            <space />
+            <space/>
             <combo key="bridge" text="Bridge" values="yes,viaduct,swing,aqueduct" match="key!" default="yes" />
             <optional>
                 <text key="name" text="Name" />
@@ -785,7 +785,7 @@
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:highway=track"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=track" />
             <label text="Edit Track" />
-            <space />
+            <space/>
             <combo key="tracktype" text="Tracktype" values="grade1,grade2,grade3,grade4,grade5" />
             <key key="highway" value="track" />
             <optional>
@@ -884,12 +884,12 @@
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Bicycle"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Bicycle" />
             <label text="Edit Cycle Lane or Track" />
-            <space />
+            <space/>
             <combo key="cycleway" text="Cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" />
             <combo key="cycleway:left" text="Cycleway left" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" />
             <combo key="cycleway:right" text="Cycleway right" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" />
             <check key="oneway:bicycle" text="Oneway (bicycle)" default="off" />
-            <space />
+            <space/>
             <optional text="Edit Highway Attributes:">
                 <combo key="highway" text="Highway" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" />
                 <check key="oneway" text="Oneway" default="off" />
@@ -1024,7 +1024,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=motorway_junction"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=motorway_junction" />
             <label text="Edit Motorway Junction" />
-            <space />
+            <space/>
             <key key="highway" value="motorway_junction" />
             <text key="name" text="Name" />
             <text key="ref" text="Number" />
@@ -1094,7 +1094,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=mini_roundabout" />
             <key key="highway" value="mini_roundabout" />
             <label text="Edit Mini-Roundabout" />
-            <space />
+            <space/>
             <combo key="direction" text="Direction" values="clockwise" />
         </item>
         <item name="Pedestrian Crossing" icon="styles/standard/vehicle/zebra_crossing.png" type="node">
@@ -1106,7 +1106,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:crossing"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:crossing" />
             <label text="Edit Pedestrian Crossing" />
-            <space />
+            <space/>
             <key key="highway" value="crossing" />
             <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
             <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
@@ -1122,15 +1122,15 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:traffic_calming"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:traffic_calming"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:traffic_calming"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:traffic_calming"/>
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:traffic_calming" />
             <label text="Edit Traffic Calming" />
-            <space />
+            <space/>
             <combo key="traffic_calming" text="Type" values="yes,bump,chicane,choker,cushion,hump,island,rumble_strip,table" match="key" />
         </item>
         <item name="Passing Place" icon="presets/passingplace.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=passing_place"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=passing_place"/>
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=passing_place" />
             <key key="highway" value="passing_place" />
         </item>
         <item name="Turning Circle" icon="presets/turning_circle.png" type="node">
@@ -1146,7 +1146,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:traffic_sign"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:traffic_sign" />
             <label text="Edit City Limit Sign" />
-            <space />
+            <space/>
             <key key="traffic_sign" value="city_limit" />
             <text key="name" text="Name" />
             <text key="alt_name" text="Second Name" />
@@ -1210,7 +1210,7 @@
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:barrier=bollard"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=bollard" />
             <label text="Edit Bollard" />
-            <space />
+            <space/>
             <key key="barrier" value="bollard" />
             <combo key="bollard" text="Bollard type" values="rising,removable" />
             <optional text="Allowed traffic:">
@@ -1517,7 +1517,7 @@
         <item name="Stile" icon="presets/stile.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
             <label text="Edit Stile" />
-            <space />
+            <space/>
             <key key="barrier" value="stile" />
             <combo key="stile" text="Type" values="ladder,squeezer,stepover" />
             <optional>
@@ -1569,7 +1569,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:tunnel"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:tunnel"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:tunnel" />
-            <label text="Edit Tunnel"/>
+            <label text="Edit Tunnel" />
             <key key="tunnel" value="yes" />
             <optional>
                 <text key="name" text="Name" />
@@ -1590,7 +1590,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:tunnel"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:tunnel"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:tunnel" />
-            <label text="Edit Building Passage"/>
+            <label text="Edit Building Passage" />
             <key key="tunnel" value="building_passage" />
             <optional>
                 <text key="name" text="Name" />
@@ -1606,8 +1606,8 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:covered"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:covered"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:covered" />
-            <label text="Edit Arcade"/>
-            <space />
+            <label text="Edit Arcade" />
+            <space/>
             <key key="covered" value="arcade" />
             <check key="arcade:left" value_on="open" text="Open on left side" />
             <check key="arcade:right" value_on="open" text="Open on right side" />
@@ -1623,8 +1623,8 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:covered"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:covered"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:covered" />
-            <label text="Edit Colonnade"/>
-            <space />
+            <label text="Edit Colonnade" />
+            <space/>
             <key key="covered" value="colonnade" />
             <check key="colonnade:left" value_on="open" text="Open on left side" />
             <check key="colonnade:right" value_on="open" text="Open on right side" />
@@ -1644,8 +1644,8 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:tunnel"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:tunnel"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:tunnel" />
-            <label text="Edit Avalanche Protector"/>
-            <space />
+            <label text="Edit Avalanche Protector" />
+            <space/>
             <key key="tunnel" value="avalanche_protector" />
             <check key="avalanche_protector:left" value_on="open" text="Open on left side" />
             <check key="avalanche_protector:right" value_on="open" text="Open on right side" />
@@ -1666,7 +1666,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=drain"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=drain" />
             <label text="Edit Drain" />
-            <space />
+            <space/>
             <key key="waterway" value="drain" />
             <text key="name" text="Name" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
@@ -1677,7 +1677,7 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=ditch"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=ditch" />
             <label text="Edit Ditch" />
-            <space />
+            <space/>
             <key key="waterway" value="ditch" />
             <text key="name" text="Name" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
@@ -1691,7 +1691,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=stream"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=stream" />
             <label text="Edit Stream" />
-            <space />
+            <space/>
             <key key="waterway" value="stream" />
             <text key="name" text="Name" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
@@ -1699,7 +1699,7 @@
         <item name="Wadi" icon="presets/waterway.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=wadi" />
             <label text="Edit Wadi" />
-            <space />
+            <space/>
             <key key="waterway" value="wadi" />
             <text key="name" text="Name" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
@@ -1711,7 +1711,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=canal"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=canal" />
             <label text="Edit Canal" />
-            <space />
+            <space/>
             <key key="waterway" value="canal" />
             <text key="name" text="Name" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
@@ -1725,7 +1725,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=river"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=river" />
             <label text="Edit River" />
-            <space />
+            <space/>
             <key key="waterway" value="river" />
             <text key="name" text="Name" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
@@ -1739,13 +1739,13 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=spring"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=spring" />
             <label text="Edit Spring" />
-            <space />
+            <space/>
             <key key="natural" value="spring" />
             <text key="name" text="Name" />
         </item>
         <item name="Waterfall" icon="presets/waterfall.png" type="node,way">
             <label text="Edit Waterfall" />
-            <space />
+            <space/>
             <key key="waterway" value="waterfall" />
             <text key="name" text="Name" />
             <text key="wikipedia" text="Wikipedia" />
@@ -1758,7 +1758,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=weir"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=weir" />
             <label text="Edit Weir" />
-            <space />
+            <space/>
             <key key="waterway" value="weir" />
             <text key="name" text="Name" />
         </item>
@@ -1769,7 +1769,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=dam"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=dam" />
             <label text="Edit Dam" />
-            <space />
+            <space/>
             <key key="waterway" value="dam" />
             <text key="name" text="Name" />
             <text key="wikipedia" text="Wikipedia" />
@@ -1785,8 +1785,8 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=breakwater"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=breakwater"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=breakwater" />
-            <label text="Edit Breakwater"/>
-            <space />
+            <label text="Edit Breakwater" />
+            <space/>
             <key key="man_made" value="breakwater" />
             <text key="ref" text="Reference" />
             <text key="name" text="Name" />
@@ -1798,7 +1798,7 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:tunnel=culvert"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:tunnel=culvert"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:tunnel=culvert" />
-            <label text="Edit Culvert"/>
+            <label text="Edit Culvert" />
             <key key="tunnel" value="culvert" />
             <optional>
                 <text key="name" text="Name" />
@@ -1810,7 +1810,7 @@
         <separator/>
         <item name="Basin" icon="presets/landuse_water.png" type="node,closedway,relation">
             <label text="Edit Basin Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="basin" />
             <text key="name" text="Name" />
         </item>
@@ -1821,13 +1821,13 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=reservoir"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=reservoir" />
             <label text="Edit Reservoir Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="reservoir" />
             <text key="name" text="Name" />
         </item>
         <item name="Covered Reservoir" icon="presets/reservoir_covered.png" type="node,closedway,relation">
             <label text="Edit Covered Reservoir" />
-            <space />
+            <space/>
             <key key="man_made" value="reservoir_covered" />
             <text key="name" text="Name" />
         </item>
@@ -1840,13 +1840,13 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=water"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=water" />
             <label text="Edit Water" />
-            <space />
+            <space/>
             <key key="natural" value="water" />
             <text key="name" text="Name" />
         </item>
         <item name="Land" icon="presets/landuse.png" type="node,closedway,relation">
             <label text="Edit Land" />
-            <space />
+            <space/>
             <key key="natural" value="land" />
             <text key="name" text="Name" />
         </item>
@@ -1856,7 +1856,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=coastline"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=coastline" />
             <label text="Edit Coastline" />
-            <space />
+            <space/>
             <key key="natural" value="coastline" />
             <text key="name" text="Name" />
         </item>
@@ -1868,7 +1868,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=riverbank"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=riverbank" />
             <label text="Edit Riverbank" />
-            <space />
+            <space/>
             <key key="waterway" value="riverbank" />
             <text key="name" text="Name" />
         </item>
@@ -1884,7 +1884,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=wetland"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=wetland" />
             <label text="Edit Wetland" />
-            <space />
+            <space/>
             <key key="natural" value="wetland" />
             <text key="name" text="Name" />
             <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove" />
@@ -1892,7 +1892,7 @@
         <item name="Mud" icon="presets/mud.png" type="node,closedway,relation">
             <label text="Edit Mud" />
             <key key="natural" value="mud" />
-            <space />
+            <space/>
             <text key="name" text="Name" />
         </item>
         <item name="Beach" icon="presets/beach.png" type="node,closedway,relation">
@@ -1902,13 +1902,13 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=beach"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=beach" />
             <label text="Edit Beach" />
-            <space />
+            <space/>
             <key key="natural" value="beach" />
             <text key="name" text="Name" />
         </item>
         <item name="Bay" icon="presets/bay.png" type="node,closedway,relation">
             <label text="Edit Bay" />
-            <space />
+            <space/>
             <key key="natural" value="bay" />
             <text key="name" text="Name" />
         </item>
@@ -1919,7 +1919,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=cliff"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=cliff" />
             <label text="Edit Cliff" />
-            <space />
+            <space/>
             <key key="natural" value="cliff" />
             <text key="name" text="Name" />
         </item>
@@ -1933,10 +1933,10 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=ferry_terminal"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=ferry_terminal" />
             <label text="Edit Ferry Terminal" />
-            <space />
+            <space/>
             <key key="amenity" value="ferry_terminal" />
             <text key="name" text="Name" />
-            <combo key="cargo" text="Cargo" values="passengers,vehicle,bicycle,hgv,passengers;vehicle" values_context="cargo"/>
+            <combo key="cargo" text="Cargo" values="passengers,vehicle,bicycle,hgv,passengers;vehicle" values_context="cargo" />
         </item>
         <item name="Ferry Route" icon="presets/ferry.png" type="way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry"
@@ -1953,7 +1953,7 @@
         <separator/>
         <item name="Marina" icon="presets/marina.png" type="node,closedway">
             <label text="Edit Marina" />
-            <space />
+            <space/>
             <key key="leisure" value="marina" />
             <text key="name" text="Name" />
         </item>
@@ -1964,7 +1964,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=pier"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=pier" />
             <label text="Edit Pier" />
-            <space />
+            <space/>
             <key key="man_made" value="pier" />
             <text key="name" text="Name" />
         </item>
@@ -1998,7 +1998,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=boatyard" />
             <label text="Edit Boatyard" />
-            <space />
+            <space/>
             <key key="waterway" value="boatyard" />
             <text key="name" text="Name" />
         </item>
@@ -2008,7 +2008,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=dock"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=dock" />
             <label text="Edit Dock" />
-            <space />
+            <space/>
             <key key="waterway" value="dock" />
             <text key="name" text="Name" />
         </item>
@@ -2213,7 +2213,7 @@
         <item name="Chair Lift" icon="presets/chair_lift.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
             <label text="Edit Chair Lift" />
-            <space />
+            <space/>
             <key key="aerialway" value="chair_lift" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2228,7 +2228,7 @@
         <item name="Drag Lift" icon="presets/drag_lift.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
             <label text="Edit Drag Lift" />
-            <space />
+            <space/>
             <key key="aerialway" value="drag_lift" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2243,7 +2243,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aerialway=cable_car"
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:aerialway=cable_car" />
             <label text="Edit Cable Car" />
-            <space />
+            <space/>
             <key key="aerialway" value="cable_car" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2260,7 +2260,7 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Proposed_features/Piste_Maps"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Proposed_features/Piste_Maps" />
             <label text="Edit Gondola" />
-            <space />
+            <space/>
             <key key="aerialway" value="gondola" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2274,7 +2274,7 @@
         <item name="Mixed Lift" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=mixed_lift" />
             <label text="Edit Mixed Lift (containing both gondolas and chairs)" />
-            <space />
+            <space/>
             <key key="aerialway" value="mixed_lift" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2289,7 +2289,7 @@
         <item name="T-bar Lift" icon="presets/drag_lift.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
             <label text="Edit T-bar Lift" />
-            <space />
+            <space/>
             <key key="aerialway" value="t-bar" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2301,7 +2301,7 @@
         <item name="J-bar Lift" icon="presets/drag_lift.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
             <label text="Edit J-bar Lift" />
-            <space />
+            <space/>
             <key key="aerialway" value="j-bar" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2313,7 +2313,7 @@
         <item name="Platter Lift" icon="presets/drag_lift.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
             <label text="Edit Platter Lift" />
-            <space />
+            <space/>
             <key key="aerialway" value="platter" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2325,7 +2325,7 @@
         <item name="Rope Tow" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
             <label text="Edit Rope Tow" />
-            <space />
+            <space/>
             <key key="aerialway" value="rope_tow" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2337,7 +2337,7 @@
         <item name="Magic Carpet" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
             <label text="Edit Magic Carpet" />
-            <space />
+            <space/>
             <key key="aerialway" value="magic_carpet" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2348,7 +2348,7 @@
         </item>
         <item name="Goods" icon="presets/goods.png" type="way">
             <label text="Edit Goods" />
-            <space />
+            <space/>
             <key key="aerialway" value="goods" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference number" />
@@ -2360,14 +2360,14 @@
         <item name="Station" name_context="aerialway" icon="presets/aerialway_station.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
             <label text="Edit Station" text_context="aerialway" />
-            <space />
+            <space/>
             <key key="aerialway" value="station" />
             <text key="name" text="Name" />
         </item>
         <item name="Pylon" icon="presets/power_tower.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
             <label text="Edit Pylon" />
-            <space />
+            <space/>
             <key key="aerialway" value="pylon" />
             <text key="name" text="Name" />
         </item>
@@ -2384,7 +2384,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=parking"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=parking" />
             <label text="Edit Parking" />
-            <space />
+            <space/>
             <key key="amenity" value="parking" />
             <text key="name" text="Name" />
             <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
@@ -2394,7 +2394,7 @@
             <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 />
+            <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" />
@@ -2406,13 +2406,13 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking_space"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=parking_space" />
             <label text="Edit Parking space" />
-            <space />
+            <space/>
             <key key="amenity" value="parking_space" />
             <text key="name" text="Name" />
             <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
             <text key="ref" text="Reference number" />
             <text key="capacity" text="Capacity" />
-            <space />
+            <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" />
@@ -2421,18 +2421,18 @@
             <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" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Parking entrance" icon="presets/parking.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking_entrance"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=parking_entrance" />
             <label text="Edit Parking entrance" />
-            <space />
+            <space/>
             <key key="amenity" value="parking_entrance" />
             <text key="name" text="Name" />
             <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
             <text key="ref" text="Reference number" />
-            <space />
+            <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" />
@@ -2441,7 +2441,7 @@
             <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" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <separator/>
         <item name="Fuel" icon="presets/fuel.png" type="node,closedway">
@@ -2456,13 +2456,13 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=fuel"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fuel" />
             <label text="Edit Fuel" />
-            <space />
+            <space/>
             <key key="amenity" value="fuel" />
             <combo key="brand" text="Brand" values="Agip,Aral,Avia,BP,Chevron,Citgo,Esso,Exxon,Gulf,Mobil,OMV,Petro-Canada,Pioneer,Q8,Repsol,Shell,Sunoco,Statoil,Tamoil,Texaco,Total,Independent" />
             <optional>
                 <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
                 <combo key="shop" text="With shop" values="yes,convenience,kiosk,no" />
                 <label text="Fuel types:" />
                 <checkgroup columns="2">
@@ -2486,9 +2486,9 @@
             </optional>
         </item>
         <item name="Charging Station" icon="styles/standard/accommodation/camping/hookup.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel" />
             <label text="Edit Charging Station (for electric cars)" />
-            <space />
+            <space/>
             <key key="amenity" value="charging_station" />
             <text key="operator" text="Operator" />
             <text key="voltage" text="Voltage" />
@@ -2496,12 +2496,12 @@
         </item>            
         <item name="Wash" icon="presets/car_wash.png" type="node,closedway">
             <label text="Edit Car Wash" />
-            <space />
+            <space/>
             <key key="amenity" value="car_wash" />
             <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" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <separator/>
         <item name="Car Dealer" icon="presets/car.png" type="node,closedway">
@@ -2513,41 +2513,41 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=car"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=car" />
             <label text="Edit Car Shop" />
-            <space />
+            <space/>
             <key key="shop" value="car" />
             <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" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Repair" icon="presets/car_repair.png" type="node,closedway">
             <label text="Edit Car Repair" />
-            <space />
+            <space/>
             <key key="shop" value="car_repair" />
             <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" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Parts" icon="presets/car_repair.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car_parts"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=car_parts" />
             <label text="Edit Car Parts" />
-            <space />
+            <space/>
             <key key="shop" value="car_parts" />
             <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" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Tyres" icon="presets/tyres.png" type="node,closedway">
             <label text="Edit Tyres" />
-            <space />
+            <space/>
             <key key="shop" value="tyres" />
             <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" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
             <label text="Contact:" />
                 <text key="phone" text="Phone Number" />
                 <text key="fax" text="Fax Number" />
@@ -2562,12 +2562,12 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=car_rental"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=car_rental" />
             <label text="Edit Car Rental" />
-            <space />
+            <space/>
             <key key="amenity" value="car_rental" />
             <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" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
         </item>
         <item name="Sharing" icon="presets/car_sharing.png" type="node,closedway">
@@ -2579,19 +2579,19 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=car_sharing"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=car_sharing" />
             <label text="Edit Car Sharing" />
-            <space />
+            <space/>
             <key key="amenity" value="car_sharing" />
             <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" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
             <text key="website" text="Website" />
         </item>
     </group> <!-- Car -->
     <group name="Motorcycle" icon="presets/motorbike.png">
         <item name="Parking" icon="styles/standard/vehicle/parking/motorbike.png" type="node,closedway">
             <label text="Edit Motorcycle Parking" />
-            <space />
+            <space/>
             <key key="amenity" value="motorcycle_parking" />
             <text key="name" text="Name" />
             <text key="capacity" text="Capacity" />
@@ -2602,14 +2602,14 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=motorcycle"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=motorcycle"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=motorcycle"/>
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=motorcycle" />
             <label text="Edit Shop Motorcycle" />
-            <space />
+            <space/>
             <key key="shop" value="motorcycle" />
             <text key="name" text="Name" />
             <combo key="brand" text="Brand" values="independent" />
             <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
             <optional text="Services:">
                 <combo key="sale" text="Sale" values="yes,brand,no" />
@@ -2639,7 +2639,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bicycle_parking"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=bicycle_parking" />
             <label text="Edit Bicycle Parking" />
-            <space />
+            <space/>
             <key key="amenity" value="bicycle_parking" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -2657,7 +2657,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=bicycle"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:shop=bicycle" />
             <label text="Edit Bicycle Shop" />
-            <space />
+            <space/>
             <key key="shop" value="bicycle" />
             <text key="name" text="Name" />
             <check key="service:bicycle:retail" text="Bicycles are sold" />
@@ -2680,27 +2680,27 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bicycle_rental"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=bicycle_rental" />
             <label text="Edit Bicycle Rental" />
-            <space />
+            <space/>
             <key key="amenity" value="bicycle_rental" />
             <text key="name" text="Name" />
         </item>
     </group> <!-- Bicycle -->
     <group name="Public Transport" icon="presets/bus.png">
         <item name="Public transport route" icon="presets/path.png" type="relation">
-            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route"/>
-            <label text="Edit Route"/>
-            <space />
-            <key key="type" value="route"/>
-            <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry"/>
-            <text key="name" text="Name"/>
-            <text key="ref" text="Reference"/>
-            <optional>
-                <text key="from" text="From (initial stop)"/>
-                <text key="to" text="To (terminal stop)"/>
-                <text key="via" text="Via (intermediate stops)"/>
-                <text key="operator" text="Operator"/>
-                <text key="network" text="Network"/>
-                <text key="description" text="Description"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route" />
+            <label text="Edit Route" />
+            <space/>
+            <key key="type" value="route" />
+            <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference" />
+            <optional>
+                <text key="from" text="From (initial stop)" />
+                <text key="to" text="To (terminal stop)" />
+                <text key="via" text="Via (intermediate stops)" />
+                <text key="operator" text="Operator" />
+                <text key="network" text="Network" />
+                <text key="description" text="Description" />
                 <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
             </optional>
             <roles>
@@ -2714,112 +2714,112 @@
             </roles>
         </item>
         <item name="Route master" icon="presets/path.png" type="relation">
-            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route_master"/>
-            <label text="Edit Route master"/>
-            <space />
-            <key key="type" value="route_master"/>
-            <combo key="route_master" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry"/>
-            <text key="name" text="Name"/>
-            <text key="ref" text="Reference"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route_master" />
+            <label text="Edit Route master" />
+            <space/>
+            <key key="type" value="route_master" />
+            <combo key="route_master" 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="operator" text="Operator"/>
-                <text key="network" text="Network"/>
+                <text key="operator" text="Operator" />
+                <text key="network" text="Network" />
                 <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
             </optional>
             <roles>
-                <role key="" text="route variant/direction (at least 2)" requisite="required" type="relation" member_expression="type=route"/> <!-- FIXME: at least 2 members are required -->
+                <role key="" text="route variant/direction (at least 2)" requisite="required" type="relation" member_expression="type=route" /> <!-- FIXME: at least 2 members are required -->
             </roles>
         </item>
         <item name="Stop Area" type="relation" icon="presets/interpolation.png">
-            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_area"/>
-            <label text="Edit Stop Area"/>
-            <space />
-            <key key="type" value="public_transport"/>
-            <key key="public_transport" value="stop_area"/>
-            <text key="name" text="Name"/>
-            <optional>
-                <text key="ref" text="Reference"/>
-                <text key="uic_ref" text="UIC reference"/>
-                <text key="uic_name" text="UIC name"/>
-                <text key="operator" text="Operator"/>
-                <text key="network" text="Network"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_area" />
+            <label text="Edit Stop Area" />
+            <space/>
+            <key key="type" value="public_transport" />
+            <key key="public_transport" value="stop_area" />
+            <text key="name" text="Name" />
+            <optional>
+                <text key="ref" text="Reference" />
+                <text key="uic_ref" text="UIC reference" />
+                <text key="uic_name" text="UIC name" />
+                <text key="operator" text="Operator" />
+                <text key="network" text="Network" />
             </optional>
             <roles>
-                <role key="stop" text="Stop Position" requisite="optional" type="node" member_expression="public_transport=stop_position"/>
-                <role key="platform" text="Platform" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform"/>
-                <role key="" text="Station or amenities" requisite="optional" type="node,way,closedway" member_expression="amenity|public_transport=station"/>
+                <role key="stop" text="Stop Position" requisite="optional" type="node" member_expression="public_transport=stop_position" />
+                <role key="platform" text="Platform" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
+                <role key="" text="Station or amenities" requisite="optional" type="node,way,closedway" member_expression="amenity|public_transport=station" />
             </roles>
         </item>
         <separator/>
         <item name="Stop Position" type="node" icon="presets/barrier.png">
-            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_area"/>
-            <label text="Edit Stop Position"/>
-            <space />
-            <key key="public_transport" value="stop_position"/>
-            <text key="name" text="Name"/>
-            <optional>
-                <text key="ref" text="Reference"/>
-                <text key="uic_ref" text="UIC reference"/>
-                <text key="uic_name" text="UIC name"/>
-                <text key="operator" text="Operator"/>
-                <text key="network" text="Network"/>
-            </optional>
-            <check key="bus" text="Bus"/>
-            <check key="highway" value_on="bus_stop" value_off="" text="Bus stop (legacy)"/>
-            <check key="tram" text="Tram"/>
-            <check key="railway" value_on="tram_stop" value_off="" text="Tram stop (legacy)"/>
-            <check key="train" text="Train"/>
-            <check key="railway" value_on="station" value_off="" text="Railway station (legacy)"/>
-            <check key="railway" value_on="halt" value_off="" text="Railway halt (legacy)"/>
-            <check key="trolleybus" text="Trolleybus"/>
-            <check key="share_taxi" text="Share taxi"/>
-            <check key="subway" text="Subway"/>
-            <check key="monorail" text="Monorail"/>
-            <check key="funicular" text="Funicular"/>
-            <check key="aerialway" text="Aerialway"/>
-            <check key="ferry" text="Ferry"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_area" />
+            <label text="Edit Stop Position" />
+            <space/>
+            <key key="public_transport" value="stop_position" />
+            <text key="name" text="Name" />
+            <optional>
+                <text key="ref" text="Reference" />
+                <text key="uic_ref" text="UIC reference" />
+                <text key="uic_name" text="UIC name" />
+                <text key="operator" text="Operator" />
+                <text key="network" text="Network" />
+            </optional>
+            <check key="bus" text="Bus" />
+            <check key="highway" value_on="bus_stop" value_off="" text="Bus stop (legacy)" />
+            <check key="tram" text="Tram" />
+            <check key="railway" value_on="tram_stop" value_off="" text="Tram stop (legacy)" />
+            <check key="train" text="Train" />
+            <check key="railway" value_on="station" value_off="" text="Railway station (legacy)" />
+            <check key="railway" value_on="halt" value_off="" text="Railway halt (legacy)" />
+            <check key="trolleybus" text="Trolleybus" />
+            <check key="share_taxi" text="Share taxi" />
+            <check key="subway" text="Subway" />
+            <check key="monorail" text="Monorail" />
+            <check key="funicular" text="Funicular" />
+            <check key="aerialway" text="Aerialway" />
+            <check key="ferry" text="Ferry" />
         </item>
         <item name="Platform" type="node,way,closedway" icon="presets/platform_bus.png">
-            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Platform"/>
-            <label text="Edit Platform"/>
-            <space />
-            <key key="public_transport" value="platform"/>
-            <text key="name" text="Name"/>
-            <check key="bench" text="Bench"/>
-            <check key="shelter" text="Shelter"/>
-            <check key="covered" text="Covered"/>
-            <combo key="wheelchair" text="Wheelchair" values="yes,no,limited,only"/>
-            <optional>
-                <text key="ref" text="Reference"/>
-                <text key="uic_ref" text="UIC reference"/>
-                <text key="uic_name" text="UIC name"/>
-                <text key="operator" text="Operator"/>
-                <text key="network" text="Network"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Platform" />
+            <label text="Edit Platform" />
+            <space/>
+            <key key="public_transport" value="platform" />
+            <text key="name" text="Name" />
+            <check key="bench" text="Bench" />
+            <check key="shelter" text="Shelter" />
+            <check key="covered" text="Covered" />
+            <combo key="wheelchair" text="Wheelchair" values="yes,no,limited,only" />
+            <optional>
+                <text key="ref" text="Reference" />
+                <text key="uic_ref" text="UIC reference" />
+                <text key="uic_name" text="UIC name" />
+                <text key="operator" text="Operator" />
+                <text key="network" text="Network" />
                 <space/>
-                <check key="bus" text="Bus"/>
-                <check key="highway" value_on="platform" text="Highway platform (legacy)"/>
-                <check key="tram" text="Tram"/>
-                <check key="train" text="Train"/>
-                <check key="railway" value_on="platform" text="Railway platform (legacy)"/>
-                <check key="trolleybus" text="Trolleybus"/>
-                <check key="share_taxi" text="Share taxi"/>
-                <check key="subway" text="Subway"/>
-                <check key="monorail" text="Monorail"/>
-                <check key="funicular" text="funicular"/>
-                <check key="aerialway" text="aerialway"/>
-                <check key="ferry" text="ferry"/>
+                <check key="bus" text="Bus" />
+                <check key="highway" value_on="platform" text="Highway platform (legacy)" />
+                <check key="tram" text="Tram" />
+                <check key="train" text="Train" />
+                <check key="railway" value_on="platform" text="Railway platform (legacy)" />
+                <check key="trolleybus" text="Trolleybus" />
+                <check key="share_taxi" text="Share taxi" />
+                <check key="subway" text="Subway" />
+                <check key="monorail" text="Monorail" />
+                <check key="funicular" text="funicular" />
+                <check key="aerialway" text="aerialway" />
+                <check key="ferry" text="ferry" />
             </optional>
         </item>
         <item name="Station" name_context="railway" type="node,closedway" icon="styles/standard/transport/railway_station.png">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:public_transport=station"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:public_transport=station" />
             <label text="Edit Station" text_context="railway" />
-            <space />
-            <key key="public_transport" value="station"/>
-            <text key="name" text="Name"/>
-            <check key="area" text="Area"/>
-            <check key="building" text="Building"/>
-            <text key="operator" text="Operator"/>
-            <text key="network" text="Network"/>
+            <space/>
+            <key key="public_transport" value="station" />
+            <text key="name" text="Name" />
+            <check key="area" text="Area" />
+            <check key="building" text="Building" />
+            <text key="operator" text="Operator" />
+            <text key="network" text="Network" />
         </item>
         <separator/>
         <item name="Subway Entrance" icon="presets/underground.png" type="node">
@@ -2840,14 +2840,14 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=vending_machine"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=vending_machine"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=vending_machine"/>
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=vending_machine" />
             <label text="Edit Ticket Machine" />
-            <space />
-            <key key="amenity" value="vending_machine"/>
-            <key key="vending" value="public_transport_tickets"/>
-            <text key="name" text="Name"/>
-            <text key="operator" text="Operator"/>
-            <text key="ref" text="Reference Number"/>
+            <space/>
+            <key key="amenity" value="vending_machine" />
+            <key key="vending" value="public_transport_tickets" />
+            <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" />
@@ -2897,7 +2897,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=platform" />
             <label text="Edit Railway Platform" />
-            <space />
+            <space/>
             <key key="railway" value="platform" />
             <text key="ref" text="Reference (track number)" />
             <text key="width" text="Width (meters)" />
@@ -2934,7 +2934,7 @@
         </item>
         <item name="Bus Platform" icon="presets/platform_bus.png" type="node,way,closedway">
             <label text="Edit Bus Platform" />
-            <space />
+            <space/>
             <key key="highway" value="platform" />
             <text key="ref" text="Reference (track number)" />
             <text key="width" text="Width (meters)" />
@@ -2947,7 +2947,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=taxi"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=taxi" />
         <label text="Edit Taxi Station" />
-        <space />
+        <space/>
         <key key="amenity" value="taxi" />
         <text key="name" text="Name" />
     </item>
@@ -2958,7 +2958,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=aerodrome"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=aerodrome" />
             <label text="Edit Airport Ground" />
-            <space />
+            <space/>
             <key key="aeroway" value="aerodrome" />
             <text key="name" text="Name" />
             <optional>
@@ -3031,7 +3031,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=terminal"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=terminal" />
             <label text="Edit Terminal" />
-            <space />
+            <space/>
             <key key="aeroway" value="terminal" />
             <text key="name" text="Name" />
         </item>
@@ -3040,7 +3040,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=gate"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=gate" />
             <label text="Edit Terminal Gate" />
-            <space />
+            <space/>
             <key key="aeroway" value="gate" />
             <text key="ref" text="Reference" />
         </item>
@@ -3056,17 +3056,17 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=hotel"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=hotel" />
             <label text="Edit Hotel" />
-            <space />
+            <space/>
             <key key="tourism" value="hotel" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
-            <space />
+            <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 />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3077,17 +3077,17 @@
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=motel"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=motel" />
             <label text="Edit Motel" />
-            <space />
+            <space/>
             <key key="tourism" value="motel" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
-            <space />
+            <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 />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3098,17 +3098,17 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=guest_house"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=guest_house" />
             <label text="Edit Guest House" />
-            <space />
+            <space/>
             <key key="tourism" value="guest_house" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
-            <space />
+            <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 />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3120,17 +3120,17 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=chalet"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=chalet" />
             <label text="Edit Chalet" />
-            <space />
+            <space/>
             <key key="tourism" value="chalet" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
-            <space />
+            <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 />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3143,17 +3143,17 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=hostel"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=hostel" />
             <label text="Edit Hostel" />
-            <space />
+            <space/>
             <key key="tourism" value="hostel" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
-            <space />
+            <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 />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3166,17 +3166,17 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=alpine_hut"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=alpine_hut" />
             <label text="Edit Alpine Hut" />
-            <space />
+            <space/>
             <key key="tourism" value="alpine_hut" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
             <text key="ele" text="Elevation" />
-            <space />
+            <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 />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3188,22 +3188,22 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=caravan_site"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=caravan_site" />
             <label text="Edit Caravan Site" />
-            <space />
+            <space/>
             <key key="tourism" value="caravan_site" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
-            <space />
+            <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 />
+            <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 />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3218,17 +3218,17 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=camp_site"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=camp_site" />
             <label text="Edit Camping Site" />
-            <space />
+            <space/>
             <key key="tourism" value="camp_site" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
-            <space />
+            <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 />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3245,20 +3245,20 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=restaurant"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=restaurant" />
             <label text="Edit Restaurant" />
-            <space />
+            <space/>
             <key key="amenity" value="restaurant" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
-            <space />
+            <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 />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3271,18 +3271,18 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=fast_food"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fast_food" />
             <label text="Edit Fast Food Restaurant" />
-            <space />
+            <space/>
             <key key="amenity" value="fast_food" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09: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 />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3294,17 +3294,17 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=food_court"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=food_court" />
             <label text="Edit Food Court" />
-            <space />
+            <space/>
             <key key="amenity" value="food_court" />
             <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" />
-            <space />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09: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 />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3319,18 +3319,18 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=cafe"
                   zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Tag:amenity=cafe" />
             <label text="Edit Cafe" />
-            <space />
+            <space/>
             <key key="amenity" value="cafe" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09: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 />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3343,18 +3343,18 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=pub"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=pub" />
             <label text="Edit Pub" />
-            <space />
+            <space/>
             <key key="amenity" value="pub" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09: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 />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3367,18 +3367,18 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=biergarten"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=biergarten" />
             <label text="Edit Biergarten" />
-            <space />
+            <space/>
             <key key="amenity" value="biergarten" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09: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 />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3394,17 +3394,17 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bar"
                   zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Tag:amenity=bar" />
             <label text="Edit Bar" />
-            <space />
+            <space/>
             <key key="amenity" value="bar" />
             <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" />
-            <space />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09: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 />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3419,15 +3419,15 @@
                   ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:amenity=nightclub"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=nightclub" />
             <label text="Edit Nightclub" />
-            <space />
+            <space/>
             <key key="amenity" value="nightclub" />
             <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" />
-            <space />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <space/>
             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
-            <space />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3439,17 +3439,17 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=stripclub"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=stripclub" />
             <label text="Edit Stripclub" />
-            <space />
+            <space/>
             <key key="amenity" value="stripclub" />
             <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" />
-            <space />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09: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 />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3459,10 +3459,10 @@
     <group name="Tourism" icon="presets/sightseeing.png">
         <item name="Attraction" icon="presets/sightseeing.png" type="node,closedway">
             <label text="Edit Attraction" />
-            <space />
+            <space/>
             <key key="tourism" value="attraction" />
             <text key="name" text="Name" />
-            <text key="opening_hours" text="Opening Hours" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Viewpoint" icon="presets/viewpoint.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint"
@@ -3471,7 +3471,7 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=viewpoint"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=viewpoint" />
             <label text="Edit Viewpoint" />
-            <space />
+            <space/>
             <key key="tourism" value="viewpoint" />
             <text key="name" text="Name" />
 <!--<check key="man_made" value="tower" text="Look-Out Tower" default="off" />-->
@@ -3484,16 +3484,16 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:information"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:information" />
             <label text="Edit Information Office" />
-            <space />
+            <space/>
             <key key="tourism" value="information" />
             <key key="information" value="office" />
             <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" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Map" icon="presets/map.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
             <label text="Edit Information Map" />
-            <space />
+            <space/>
             <key key="tourism" value="information" />
             <key key="information" value="map" />
             <text key="name" text="Name" />
@@ -3506,7 +3506,7 @@
                 <check key="mtb" text="Mountainbiking" default="off" />
                 <check key="ski" text="Skiing" default="off" />
                 <check key="horse" text="Riding" default="off" />
-                <space />
+                <space/>
                 <label text="... other transportation modes possible" />
             </optional>
         </item>
@@ -3515,7 +3515,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Proposed_features/information"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Proposed_features/information" />
             <label text="Edit Information Board" />
-            <space />
+            <space/>
             <key key="tourism" value="information" />
             <key key="information" value="board" />
             <text key="name" text="Name" />
@@ -3527,7 +3527,7 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:information=guidepost"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:information=guidepost" />
             <label text="Edit Guidepost" />
-            <space />
+            <space/>
             <key key="tourism" value="information" />
             <key key="information" value="guidepost" />
             <text key="name" text="Name" />
@@ -3538,14 +3538,14 @@
                 <check key="mtb" text="Mountainbiking" default="off" />
                 <check key="ski" text="Skiing" default="off" />
                 <check key="horse" text="Riding" default="off" />
-                <space />
+                <space/>
                 <label text="... other transportation modes possible" />
             </optional>
         </item>
         <item name="Information Terminal" icon="presets/information.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
             <label text="Edit Information Terminal" />
-            <space />
+            <space/>
             <key key="tourism" value="information" />
             <key key="information" value="terminal" />
             <text key="name" text="Name" />
@@ -3557,7 +3557,7 @@
         <item name="Audioguide" icon="presets/information.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
             <label text="Edit Audioguide" />
-            <space />
+            <space/>
             <key key="tourism" value="information" />
             <key key="information" value="audioguide" />
             <text key="name" text="Name" />
@@ -3565,7 +3565,7 @@
             <text key="operator" text="Operator" />
             <text key="ref" text="Reference number" />
             <combo key="fee" text="Fee" values="yes,no" />
-            <space />
+            <space/>
             <label text="Audioguide via mobile phone?" />
             <text key="phone" text="Phone number" />
         </item>
@@ -3576,7 +3576,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=information"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=information" />
             <label text="Edit Information Point" />
-            <space />
+            <space/>
             <key key="tourism" value="information" />
             <text key="name" text="Name" />
             <text key="description" text="Closer Description" />
@@ -3591,23 +3591,23 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=cinema"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=cinema" />
             <label text="Edit Cinema" />
-            <space />
+            <space/>
             <key key="amenity" value="cinema" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />            
-            <combo key="opening_hours" text="Opening Hours" values="Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" /> 
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Zoo" icon="presets/zoo.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zoo"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=zoo" />
             <label text="Edit Zoo" />
-            <space />
+            <space/>
             <key key="tourism" value="zoo" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
             <text key="wikipedia" text="Wikipedia" />
-            <space />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3623,12 +3623,12 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=dog_park"
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:leisure=dog_park" />
             <label text="Edit Dog Park" />
-            <space />
+            <space/>
             <key key="leisure" value="dog_park" />
             <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" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
             <check key="lit" text="Lit" default="off" />
         </item>  
         <item name="Theme Park" icon="presets/theme_park.png" type="node,closedway">
@@ -3636,12 +3636,12 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=theme_park"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=theme_park"  />	
             <label text="Edit Theme Park" />
-            <space />
+            <space/>
             <key key="tourism" value="theme_park" />
             <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" />
-            <space />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3656,12 +3656,12 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisurem=water_park"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:leisure=water_park"  />	
             <label text="Edit Water Park" />
-            <space />
+            <space/>
             <key key="leisure" value="water_park" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />            
-            <combo key="opening_hours" text="Opening Hours" values="Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" /> 
-            <space />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3673,13 +3673,13 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=sauna"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=sauna" />
             <label text="Edit Sauna" />
-            <space />
+            <space/>
             <key key="leisure" value="sauna" />
             <text key="name" text="Name" />            
             <text key="operator" text="Operator" />            
-            <combo key="opening_hours" text="Opening Hours" values="Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" /> 
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
             <combo key="access" text="Access" values="yes,permissive,private,unknown" />                                           
-            <space />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3688,13 +3688,13 @@
         <item name="Horse riding" icon="presets/equestrian.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=horse_riding" />
             <label text="Edit Horse riding" />
-            <space />
+            <space/>
             <key key="leisure" value="horse_riding" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" values="Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
             <text key="fee" text="Fee" />
-            <space />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3707,15 +3707,15 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=brothel"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=brothel" />
             <label text="Edit Brothel" />
-            <space />
+            <space/>
             <key key="amenity" value="brothel" />
             <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" />
-            <space />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <space/>
             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
-            <space />
+            <space/>
             <text key="phone" text="Phone Number" />
             <text key="fax" text="Fax Number" />
             <text key="website" text="Website" />
@@ -3733,13 +3733,13 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=playground"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:leisure=playground" />
             <label text="Edit Playground" />
-            <space />
+            <space/>
             <key key="leisure" value="playground" />
             <text key="name" text="Name" />
         </item>
         <item name="Picnic Site" icon="presets/picnic.png" type="node,closedway">
             <label text="Edit Picnic Site" />
-            <space />
+            <space/>
             <key key="tourism" value="picnic_site" />
             <text key="name" text="Name" />
             <check key="fireplace" text="Fireplace" default="off" />
@@ -3750,8 +3750,8 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=bbq"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bbq"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bbq" />
-            <label text="Edit Public Grill"/>
-            <space />            
+            <label text="Edit Public Grill" />
+            <space/>            
             <key key="amenity" value="bbq" />
             <text key="name" text="Name" />
             <combo key="covered" text="Covered" values="yes,no" />                               
@@ -3763,7 +3763,7 @@
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=fishing"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=fishing" />
             <label text="Edit Fishing" />
-            <space />
+            <space/>
             <key key="leisure" value="fishing" />
             <text key="name" text="Name" />
         </item>
@@ -3779,11 +3779,11 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=museum"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=museum" />
             <label text="Edit Museum" />
-            <space />
+            <space/>
             <key key="tourism" value="museum" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
             <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="Theatre" icon="presets/theater.png" type="node,closedway,relation">
@@ -3793,7 +3793,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=theatre"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=theatre" />
             <label text="Edit Theatre" />
-            <space />
+            <space/>
             <key key="amenity" value="theatre" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3807,11 +3807,11 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=library"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=library" />
             <label text="Edit Library" />
-            <space />
+            <space/>
             <key key="amenity" value="library" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre"
@@ -3820,7 +3820,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=arts_centre"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=arts_centre" />
             <label text="Edit Arts Centre" />
-            <space />
+            <space/>
             <key key="amenity" value="arts_centre" />
             <text key="name" text="Name" />
         </item>
@@ -3832,7 +3832,7 @@
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:tourism=artwork"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=artwork" />
             <label text="Edit Artwork" />
-            <space />
+            <space/>
             <key key="tourism" value="artwork" />
             <text key="name" text="Name" />
         </item>
@@ -3851,21 +3851,21 @@
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
                   zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
             <label text="Edit Place of Worship" />
-            <space />
+            <space/>
             <key key="amenity" value="place_of_worship" />
             <text key="name" text="Name" />
             <combo key="building" text="Building type" values="cathedral,chapel,church,mosque,synagogue,temple" match="keyvalue" />
             <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" match="key" />
             <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,roman_catholic,shia,sunni" match="key" />
-            <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" />
+            <combo key="service_times" text="Service times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+            <combo key="opening_hours" text="Opening hours for visiting" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Recording Studio" icon="presets/studio.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=studio"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=studio"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=studio" />
             <label text="Edit Studio" />
-            <space />            
+            <space/>            
             <key key="amenity" value="studio" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />            
@@ -3881,7 +3881,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=public_building"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=public_building" />
             <label text="Edit Public Building" />
-            <space />
+            <space/>
             <key key="amenity" value="public_building" />
             <text key="name" text="Name" />
         </item>
@@ -3893,7 +3893,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=townhall"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=townhall" />
             <label text="Edit Town hall" />
-            <space />
+            <space/>
             <key key="amenity" value="townhall" />
             <text key="name" text="Name" />
         </item>
@@ -3905,11 +3905,11 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=community_centre"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=community_centre" />
             <label text="Community Centre" />
-            <space />            
+            <space/>            
             <key key="amenity" value="community_centre" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>       	
         <item name="Embassy" icon="presets/embassy.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy"
@@ -3918,7 +3918,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=embassy"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=embassy" />
             <label text="Edit Embassy" />
-            <space />
+            <space/>
             <key key="amenity" value="embassy" />
             <text key="name" text="Name" />
         </item>
@@ -3929,7 +3929,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=courthouse"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=courthouse" />
             <label text="Edit Courthouse" />
-            <space />
+            <space/>
             <key key="amenity" value="courthouse" />
             <text key="name" text="Name" />
         </item>
@@ -3940,7 +3940,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=prison"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=prison" />
             <label text="Edit Prison" />
-            <space />
+            <space/>
             <key key="amenity" value="prison" />
             <text key="name" text="Name" />
         </item>
@@ -3954,7 +3954,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=police"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=police" />
             <label text="Edit Police" />
-            <space />
+            <space/>
             <key key="amenity" value="police" />
             <text key="name" text="Name" />
         </item>
@@ -3967,7 +3967,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=fire_station"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fire_station" />
             <label text="Edit Fire Station" />
-            <space />
+            <space/>
             <key key="amenity" value="fire_station" />
             <text key="name" text="Name" />
         </item>
@@ -3980,7 +3980,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=post_office"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=post_office" />
             <label text="Edit Post Office" />
-            <space />
+            <space/>
             <key key="amenity" value="post_office" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -3989,7 +3989,7 @@
     <group name="Education" icon="presets/school.png">
         <item name="Kindergarten" icon="presets/kindergarten.png" type="node,closedway,relation">
             <label text="Edit Kindergarten" />
-            <space />
+            <space/>
             <key key="amenity" value="kindergarten" />
             <text key="name" text="Name" />
         </item>
@@ -4005,7 +4005,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=school"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=school" />
             <label text="Edit School" />
-            <space />
+            <space/>
             <key key="amenity" value="school" />
             <text key="name" text="Name" />
         </item>
@@ -4019,7 +4019,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=university"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=university" />
             <label text="Edit University" />
-            <space />
+            <space/>
             <key key="amenity" value="university" />
             <text key="name" text="Name" />
         </item>
@@ -4030,14 +4030,14 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=college"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=college" />
             <label text="Edit College" />
-            <space />
+            <space/>
             <key key="amenity" value="college" />
             <text key="name" text="Name" />
         </item>
          <item name="Driving School" icon="styles/standard/education/driving_school.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/driving_school" />
-            <label text="Edit Driving School"/>
-            <space />
+            <label text="Edit Driving School" />
+            <space/>
             <key key="amenity" value="driving_school" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -4054,7 +4054,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=hospital"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=hospital" />
             <label text="Edit Hospital" />
-            <space />
+            <space/>
             <key key="amenity" value="hospital" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -4063,7 +4063,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clinic"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=clinic" />
             <label text="Edit Clinic" />
-            <space />
+            <space/>
             <key key="amenity" value="clinic" />
             <text key="name" text="Name" />
         </item>
@@ -4072,21 +4072,21 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=doctors"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=doctors" />
             <label text="Edit Doctors" />
-            <space />
+            <space/>
             <key key="amenity" value="doctors" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway">
             <label text="Edit Dentist" />
-            <space />
+            <space/>
             <key key="amenity" value="dentist" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Nursing Home" type="node,closedway">
             <label text="Edit Nursing Home" />
-            <space />
+            <space/>
             <key key="amenity" value="nursing_home" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -4098,7 +4098,7 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:social_facility"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:social_facility" />
             <label text="Edit Retirement Home" />
-            <space />
+            <space/>
             <key key="amenity" value="social_facility" />
             <key key="social_facility" value="group_home" />
             <key key="social_facility:for" value="senior" />
@@ -4116,21 +4116,21 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=pharmacy"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=pharmacy" />
             <label text="Edit Pharmacy" />
-            <space />
+            <space/>
             <key key="amenity" value="pharmacy" />
             <text key="name" text="Name" />
             <combo key="dispensing" text="Dispensing" values="yes,no" default="no" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hearing_aids"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hearing_aids"/>
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hearing_aids" />
             <label text="Edit Hearing Aids" />
-            <space />
+            <space/>
             <key key="shop" value="hearing_aids" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <separator/>
         <item name="Baby Hatch" icon="presets/baby_hatch.png" type="node,closedway">
@@ -4145,10 +4145,10 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=baby_hatch"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=baby_hatch" />
             <label text="Edit Baby Hatch" />
-            <space />
+            <space/>
             <key key="amenity" value="baby_hatch" />
             <text key="operator" text="Operator" />
-            <text key="opening_hours" text="Opening Hours" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <separator/>
         <item name="Emergency Access Point" icon="styles/standard/service/emergency_access_point.png" type="node,closedway">
@@ -4158,14 +4158,14 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=emergency_access_point"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=emergency_access_point" />
             <label text="Edit Emergency Access Point" />
-            <space />
+            <space/>
             <key key="highway" value="emergency_access_point" />
             <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 />
+            <space/>
         </item>
         <separator/>
         <item name="Veterinary" icon="styles/standard/health/veterinary.png" type="node,closedway">
@@ -4175,10 +4175,10 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=veterinary"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=veterinary" />
             <label text="Edit Veterinary" />
-            <space />
+            <space/>
             <key key="amenity" value="veterinary" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
     </group> <!-- Health -->
     <group name="Facilities" icon="presets/telephone.png">
@@ -4190,7 +4190,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=toilets"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=toilets" />
             <label text="Edit Toilets" />
-            <space />
+            <space/>
             <key key="amenity" value="toilets" />
             <combo key="access" text="Access rights" values="public,permissive,customers" />
             <combo key="drinking_water" text="Drinking Water" values="yes,no,seasonal" />
@@ -4211,11 +4211,11 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=post_box"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=post_box" />
             <label text="Edit Postbox" />
-            <space />
+            <space/>
             <key key="amenity" value="post_box" />
             <text key="operator" text="Operator" />
             <text key="ref" text="Reference number" />
-            <text key="collection_times" text="Collection times" />
+            <combo key="collection_times" text="Collection times" delimiter="|" values="11:30|Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00|Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off" />
             <check key="drive_through" text="Drive through" />
         </item>
         <item name="Telephone" icon="presets/telephone.png" type="node">
@@ -4227,7 +4227,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=telephone"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=telephone" />
             <label text="Edit Telephone" />
-            <space />
+            <space/>
             <key key="amenity" value="telephone" />
             <text key="operator" text="Operator" />
             <check key="payment:coins" text="Coins" default="off" />
@@ -4249,7 +4249,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=aed"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=aed" />
             <label text="Edit Automated External Defibrillator" />
-            <space />
+            <space/>
             <key key="emergency" value="aed" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,limited" />
             <text  key="operator" text="Operator" /> 
@@ -4289,7 +4289,7 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=recycling"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=recycling" />
             <label text="Edit Recycling Station" />
-            <space />
+            <space/>
             <key key="amenity" value="recycling" />
             <check key="recycling:batteries" text="Batteries" default="off" />
             <check key="recycling:cans" text="Cans" default="off" />
@@ -4326,7 +4326,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bench"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bench" />
             <label text="Edit Bench" />
-            <space />
+            <space/>
             <key key="amenity" value="bench" />
             <combo key="backrest" text="Backrest" values="yes,no" />
             <combo key="material" text="Material" values="stone,metal,wood,plastic" />
@@ -4335,7 +4335,7 @@
         </item>
         <item name="Shelter" icon="presets/shelter.png" type="node,closedway">
             <label text="Edit Shelter" />
-            <space />
+            <space/>
             <key key="amenity" value="shelter" />
             <text key="name" text="Name" />
             <check key="fireplace" text="Fireplace" default="off" />
@@ -4343,7 +4343,7 @@
         </item>
         <item name="Hunting Stand" icon="presets/hunting_stand.png" type="node">
             <label text="Edit Hunting Stand" />
-            <space />
+            <space/>
             <key key="amenity" value="hunting_stand" />
             <combo key="height" text="Height" values="low,half,full,5,10,15,20" values_context="height" />
             <combo key="shelter" text="Shelter" values="yes,no,unknown" />
@@ -4358,7 +4358,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=drinking_water"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=drinking_water" />
             <label text="Edit Source of Potable Water" />
-            <space />
+            <space/>
             <key key="amenity" value="drinking_water" />
             <check key="indoor" text="Indoor" default="off" />
             <optional>
@@ -4375,15 +4375,15 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:emergency=fire_hydrant"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:emergency=fire_hydrant" />
             <label text="Edit Fire Hydrant" />
-            <space />
+            <space/>
             <key key="emergency" value="fire_hydrant" />
             <combo key="fire_hydrant:type" text="Type" values="underground,pillar,wall,pond" values_context="pipeline" default="pillar" />
             <combo key="fire_hydrant:diameter" text="Diameter (in mm)" values="50,80,100,150,200,250,300,400" />
-            <space />
+            <space/>
             <text key="name" text="Name" />
             <text key="ref" text="Reference" />
             <text key="operator" text="Operator" />
-            <space />
+            <space/>
             <combo key="fire_hydrant:position" text="Hydrant Position" values="lane,parking_lot,sidewalk,green" values_context="hydrant position" />
             <combo key="fire_hydrant:pressure" text="Pressure (in bar)" values="5,6,8,suction" />
             <text key="fire_hydrant:count" text="Count" values="" />
@@ -4394,7 +4394,7 @@
     <group name="Sport Facilities" icon="presets/stadium.png">
         <item name="Stadium" icon="presets/stadium.png" type="node,closedway">
             <label text="Edit Stadium" />
-            <space />
+            <space/>
             <key key="leisure" value="stadium" />
             <text key="name" text="Name" />
             <optional text="Select sport:">
@@ -4403,7 +4403,7 @@
         </item>
         <item name="Sports Centre" icon="presets/sports_centre.png" type="node,closedway">
             <label text="Edit Sports Centre" />
-            <space />
+            <space/>
             <key key="leisure" value="sports_centre" />
             <text key="name" text="Name" />
             <optional text="Select sport:">
@@ -4412,7 +4412,7 @@
         </item>
         <item name="Pitch" icon="presets/pitch.png" type="node,closedway">
             <label text="Edit Pitch" />
-            <space />
+            <space/>
             <key key="leisure" value="pitch" />
             <text key="name" text="Name" />
             <optional text="Select sport:">
@@ -4421,7 +4421,7 @@
         </item>
         <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway,relation">
             <label text="Edit Racetrack" />
-            <space />
+            <space/>
             <key key="leisure" value="track" />
             <text key="name" text="Name" />
             <optional text="Select sport:">
@@ -4430,24 +4430,24 @@
         </item>
         <item name="Golf Course" icon="presets/golf.png" type="node,closedway">
             <label text="Edit Golf Course" />
-            <space />
+            <space/>
             <key key="leisure" value="golf_course" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Miniature Golf" icon="presets/golf.png" type="node,closedway">
             <label text="Edit Miniature Golf" />
-            <space />
+            <space/>
             <key key="leisure" value="miniature_golf" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
     </group> <!-- Sport facilities -->
     <group name="Sport" icon="presets/rowing.png">
         <item name="Multi" icon="styles/standard/sport/multi.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=multi" />
             <label text="Edit Multi" />
-            <space />
+            <space/>
             <key key="sport" value="multi" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" />
@@ -4456,7 +4456,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=9pin"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=9pin" />
             <label text="Edit 9pin" />
-            <space />
+            <space/>
             <key key="sport" value="9pin" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
@@ -4464,7 +4464,7 @@
         <item name="10pin" icon="styles/standard/sport/10pin.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=10pin" />
             <label text="Edit 10pin" />
-            <space />
+            <space/>
             <key key="sport" value="10pin" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
@@ -4472,7 +4472,7 @@
         <item name="Archery" icon="styles/standard/sport/archery.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=archery" />
             <label text="Edit Archery" />
-            <space />
+            <space/>
             <key key="sport" value="archery" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
@@ -4480,7 +4480,7 @@
         <item name="Athletics" icon="presets/athletics.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sports=athletics" />
             <label text="Edit Athletics" />
-            <space />
+            <space/>
             <key key="sport" value="athletics" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" default="track" />
@@ -4489,7 +4489,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=climbing"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=climbing" />
             <label text="Edit Climbing" />
-            <space />
+            <space/>
             <key key="sport" value="climbing" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="sports_centre" />
@@ -4497,14 +4497,14 @@
         <item name="Canoeing" icon="presets/canoe.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canoe" />
             <label text="Edit Canoeing" />
-            <space />
+            <space/>
             <key key="sport" value="canoe" />
             <text key="name" text="Name" />
         </item>
         <item name="Cycling" icon="presets/cycling.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cycling" />
             <label text="Edit Cycling" />
-            <space />
+            <space/>
             <key key="sport" value="cycling" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
@@ -4512,7 +4512,7 @@
         <item name="Dog Racing" icon="styles/standard/leisure/dog.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=dog_racing" />
             <label text="Edit Dog Racing" />
-            <space />
+            <space/>
             <key key="sport" value="dog_racing" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
@@ -4520,7 +4520,7 @@
         <item name="Equestrian" icon="presets/equestrian.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=equestrian" />
             <label text="Edit Equestrian" />
-            <space />
+            <space/>
             <key key="sport" value="equestrian" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="riding" />
@@ -4529,7 +4529,7 @@
         <item name="Horse Racing" icon="presets/equestrian.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=horse_racing" />
             <label text="Edit Horse Racing" />
-            <space />
+            <space/>
             <key key="sport" value="horse_racing" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="riding" />
@@ -4538,7 +4538,7 @@
         <item name="Gymnastics" icon="presets/gymnastics.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gymnastics" />
             <label text="Edit Gymnastics" />
-            <space />
+            <space/>
             <key key="sport" value="gymnastics" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
@@ -4547,7 +4547,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skating"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=skating" />
             <label text="Edit Skating" />
-            <space />
+            <space/>
             <key key="sport" value="skating" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" default="ice_rink" />
@@ -4556,7 +4556,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skateboard"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=skateboard" />
             <label text="Edit Skateboard" />
-            <space />
+            <space/>
             <key key="sport" value="skateboard" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" default="pitch" values_context="racing" />
@@ -4565,15 +4565,15 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=swimming"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=swimming" />
             <label text="Edit Swimming" />
-            <space />
+            <space/>
             <key key="sport" value="swimming" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="sports_centre,stadium,swimming_pool,water_park" default="swimming_pool" />
         </item>
         <item name="Skiing" icon="presets/skiing_downhill.png" type="node,way,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
             <label text="Edit Skiing" />
-            <space />
+            <space/>
             <key key="sport" value="skiing" />
             <text key="name" text="Name" />
             <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,snow_park" />
@@ -4587,7 +4587,7 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=shooting"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=shooting" />
             <label text="Edit Shooting" />
-            <space />
+            <space/>
             <key key="sport" value="shooting" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
@@ -4597,41 +4597,41 @@
         <item name="Soccer" icon="presets/soccer.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=soccer"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:sport=soccer"
-                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=soccer"/>
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=soccer" />
             <label text="Edit Soccer" />
-            <space />
+            <space/>
             <key key="sport" value="soccer" />
             <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">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=australian_football"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=australian_football" />
             <label text="Edit Australian Football" />
-            <space />
+            <space/>
             <key key="sport" value="australian_football" />
             <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">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=american_football"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=american_football" />
             <label text="Edit American Football" />
-            <space />
+            <space/>
             <key key="sport" value="american_football" />
             <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">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canadian_football"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canadian_football" />
             <label text="Edit Canadian Football" />
-            <space />
+            <space/>
             <key key="sport" value="canadian_football" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
         </item>
         <item name="Gaelic Games" icon="presets/soccer.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_games"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_games" />
             <label text="Edit Gaelic Games" />
-            <space />
+            <space/>
             <key key="sport" value="gaelic_games" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
@@ -4644,34 +4644,34 @@
         </item>
         <item name="Rugby League" icon="presets/football.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_league"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_league"/>
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_league" />
             <label text="Edit Rugby League" />
-            <space />
+            <space/>
             <key key="sport" value="rugby_league" />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_union"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_union"/>
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_union" />
             <label text="Edit Rugby Union" />
-            <space />
+            <space/>
             <key key="sport" value="rugby_union" />
             <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">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=baseball"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=baseball" />
             <label text="Edit Baseball" />
-            <space />
+            <space/>
             <key key="sport" value="baseball" />
             <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">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=basketball"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=basketball" />
             <label text="Edit Basketball" />
-            <space />
+            <space/>
             <key key="sport" value="basketball" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
@@ -4679,7 +4679,7 @@
         <item name="Volleyball" icon="styles/standard/sport/volleyball.png" type="node,closedway">         	
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=volleyball" />
             <label text="Edit Volleyball" />
-            <space />            
+            <space/>            
             <key key="sport" value="volleyball" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" /> 
@@ -4688,7 +4688,7 @@
         <item name="Beachvolleyball" icon="presets/beachvolleyball.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=beachvolleyball" />
             <label text="Edit Beachvolleyball" />
-            <space />            
+            <space/>            
             <key key="sport" value="beachvolleyball" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" /> 
@@ -4697,91 +4697,91 @@
         <item name="Golf" icon="presets/golf.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=golf"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:sport=golf"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:sport=golf"/>
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:sport=golf" />
             <label text="Edit Golf" />
-            <space />
+            <space/>
             <key key="sport" value="golf" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="golf_course,pitch,sports_centre,stadium" default="golf_course" />
         </item>
         <item name="Boule" icon="presets/boule.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=boules"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=boules" />
             <label text="Edit Boule" />
-            <space />
+            <space/>
             <key key="sport" value="boules" />
             <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">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=bowls"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=bowls" />
             <label text="Edit Bowls" />
-            <space />
+            <space/>
             <key key="sport" value="bowls" />
             <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">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket" />
             <label text="Edit Cricket" />
-            <space />
+            <space/>
             <key key="sport" value="cricket" />
             <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">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket_nets"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket_nets" />
             <label text="Edit Cricket Nets" />
-            <space />
+            <space/>
             <key key="sport" value="cricket_nets" />
             <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">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=croquet"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=croquet" />
             <label text="Edit Croquet" />
-            <space />
+            <space/>
             <key key="sport" value="croquet" />
             <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">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=hockey"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=hockey" />
             <label text="Edit Hockey" />
-            <space />
+            <space/>
             <key key="sport" value="hockey" />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=pelota"
-                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=pelota"/>
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=pelota" />
             <label text="Edit Pelota" />
-            <space />
+            <space/>
             <key key="sport" value="pelota" />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=racquet"
-                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=racquet"/>
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=racquet" />
             <label text="Edit Racquet" />
-            <space />
+            <space/>
             <key key="sport" value="racquet" />
             <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">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=table_tennis"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=table_tennis" />
             <label text="Edit Table Tennis" />
-            <space />
+            <space/>
             <key key="sport" value="table_tennis" />
             <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">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=tennis"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=tennis" />
             <label text="Edit Tennis" />
-            <space />
+            <space/>
             <key key="sport" value="tennis" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
@@ -4790,28 +4790,28 @@
     <group name="Motorsport" icon="presets/motorbike.png">
         <item name="Motorsport" icon="styles/standard/sport/motor.png" type="node,closedway">
             <label text="Edit Motorsport" />
-            <space />
+            <space/>
             <key key="sport" value="motor" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
         </item>
         <item name="Karting" icon="presets/karting.png" type="node,closedway">
             <label text="Edit Karting" />
-            <space />
+            <space/>
             <key key="sport" value="karting" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
         </item>
         <item name="Motocross" icon="styles/standard/sport/motocross.png" type="node,closedway">
             <label text="Edit Motocross" />
-            <space />
+            <space/>
             <key key="sport" value="motocross" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
         </item>
         <item name="Safety Training" icon="presets/safety_training.png" type="node,closedway">
             <label text="Edit Safety Training" />
-            <space />
+            <space/>
             <key key="sport" value="safety_training" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
@@ -4819,14 +4819,14 @@
         <separator/>
         <item name="Model Aerodrome" icon="presets/plane.png" type="node,closedway">
             <label text="Edit Model Aerodrome" />
-            <space />
+            <space/>
             <key key="sport" value="model_aerodrome" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="aerialway" />
         </item>
         <item name="RC Car" icon="presets/car.png" type="node,closedway">
             <label text="Edit RC Car" />
-            <space />
+            <space/>
             <key key="sport" value="rc_car" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
@@ -4849,7 +4849,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:building"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:building" />
             <label text="Edit Building" />
-            <space />
+            <space/>
             <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,farm,transportation,greenhouse,office,university,hospital,warehouse,retail,shed" values_context="building" default="yes" match="keyvalue" />
             <text key="name" text="Name" />
         </item>
@@ -4864,7 +4864,7 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:building"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:building" />
             <label text="Edit Residential Building" />
-            <space />
+            <space/>
             <combo key="building" text="Building" values="residential,apartments,house,hut,terrace,detached,roof" default="residential" match="keyvalue" values_context="building" />
             <text key="name" text="Name" />
         </item>
@@ -4876,14 +4876,14 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:entrance"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:entrance" />
             <label text="Edit Entrance" />
-            <space />
+            <space/>
             <combo key="entrance" text="Entrance" values="yes,main,service,exit,emergency" values_context="entrance" default="yes" match="key" />
             <combo key="access" text="Access" values="yes,delivery,private,no" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
         </item>
         <item name="Tower" icon="presets/tower.png" type="node,closedway">
             <label text="Edit Tower" />
-            <space />
+            <space/>
             <key key="man_made" value="tower" />
             <text key="name" text="Name" />
             <combo key="tower:type" text="Tower type" values="communication,observation" />
@@ -4900,14 +4900,14 @@
         <separator/>
         <item name="Works" icon="presets/works.png" type="node,closedway">
             <label text="Edit Works" />
-            <space />
+            <space/>
             <key key="man_made" value="works" />
             <text key="name" text="Name" />
         </item>
         <item name="Chimney" icon="presets/chimney.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Chimney" />
             <label text="Edit Chimney" />
-            <space />            
+            <space/>            
             <key key="man_made" value="chimney" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />            
@@ -4919,13 +4919,13 @@
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:man_made=windmill"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=windmill" />
             <label text="Edit Windmill" />
-            <space />
+            <space/>
             <key key="man_made" value="windmill" />
             <text key="name" text="Name" />
         </item>
         <item name="Gasometer" icon="presets/gasometer.png" type="node,closedway">
             <label text="Edit Gasometer" />
-            <space />
+            <space/>
             <key key="man_made" value="gasometer" />
             <text key="name" text="Name" />
         </item>
@@ -4933,9 +4933,9 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=pipeline"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=pipeline"/>
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=pipeline" />
             <label text="Edit Pipeline" />
-            <space />
+            <space/>
             <key key="man_made" value="pipeline" />
             <text key="operator" text="Operator" />
             <combo key="type" text="Type" values="water,gas,heat,oil,sewage" />
@@ -4946,7 +4946,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=crane"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=crane" />
             <label text="Edit Crane" />
-            <space />
+            <space/>
             <key key="man_made" value="crane" />
             <text key="name" text="Name" />
         </item>
@@ -4955,7 +4955,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=mineshaft"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=mineshaft" />
             <label text="Edit Mineshaft" />
-            <space />
+            <space/>
             <key key="man_made" value="mineshaft" />
             <text key="name" text="Name" />
             <combo key="mineshaft_type" text="Function" values="winding,air" />
@@ -4971,7 +4971,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=adit"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=adit" />
             <label text="Edit Adit" />
-            <space />
+            <space/>
             <key key="man_made" value="adit" />
             <text key="name" text="Name" />
             <text key="length" text="Length in meters" />
@@ -4982,7 +4982,7 @@
         <separator/>
         <item name="Water Tower" icon="presets/water_tower.png" type="node,closedway">
             <label text="Edit Water Tower" />
-            <space />
+            <space/>
             <key key="man_made" value="water_tower" />
             <text key="name" text="Name" />
         </item>
@@ -4992,7 +4992,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=water_works"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=water_works" />
             <label text="Edit Water Works" />
-            <space />            
+            <space/>            
             <key key="man_made" value="water_works" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />            
@@ -5006,7 +5006,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=wastewater_plant"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=wastewater_plant" />
             <label text="Edit Wastewater Plant" />
-            <space />
+            <space/>
             <key key="man_made" value="wastewater_plant" />
             <text key="name" text="Name" />
         </item>
@@ -5014,8 +5014,8 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=watermill"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=watermill"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=watermill" />
-            <label text="Edit Watermill"/>
-            <space />            
+            <label text="Edit Watermill" />
+            <space/>            
             <key key="man_made" value="watermill" />
             <text key="name" text="Name" />
         </item>       
@@ -5028,7 +5028,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=fountain"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fountain" />
             <label text="Edit Fountain" />
-            <space />
+            <space/>
             <key key="amenity" value="fountain" />
             <text key="name" text="Name" />
         </item>
@@ -5038,7 +5038,7 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=water_well"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=water_well" />
             <label text="Edit Water Well" />
-            <space />
+            <space/>
             <key key="man_made" value="water_well" />
             <text key="name" text="Name" />
         </item>
@@ -5049,7 +5049,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=lighthouse"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=lighthouse" />
             <label text="Edit Lighthouse" />
-            <space />
+            <space/>
             <key key="man_made" value="lighthouse" />
             <text key="name" text="Name" />
         </item>
@@ -5058,7 +5058,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=beacon"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=beacon" />
             <label text="Edit Beacon" />
-            <space />
+            <space/>
             <key key="man_made" value="beacon" />
             <text key="name" text="Name" />
         </item>
@@ -5067,14 +5067,14 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=street_lamp"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=street_lamp" />
             <label text="Edit Street Lamp" />
-            <space />            
+            <space/>            
             <key key="highway" value="street_lamp" />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/measurement_station" />
             <label text="Edit Measurement Station" />
-            <space />            
+            <space/>            
             <key key="man_made" value="measurement_station" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />             
@@ -5087,7 +5087,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=survey_point"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=survey_point" />
             <label text="Edit Survey Point" />
-            <space />
+            <space/>
             <key key="man_made" value="survey_point" />
             <text key="name" text="Name" />
         </item>
@@ -5096,7 +5096,7 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=surveillance"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=surveillance" />
             <label text="Edit Surveillance Camera" />
-            <space />
+            <space/>
             <key key="man_made" value="surveillance" />
             <text key="name" text="Name" />
             <combo key="surveillance" text="Type" values="indoor,outdoor,public" />
@@ -5106,7 +5106,7 @@
         <item name="Power Plant" icon="presets/power.png" type="closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=plant" />
             <label text="Edit Power Plant" />
-            <space />
+            <space/>
             <key key="power" value="plant" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -5115,7 +5115,7 @@
             <optional>
                 <label text="Output forms of energy" />
                 <label text="(please add this information to the generators if possible)" />
-                <space />
+                <space/>
                 <combo key="plant:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
                 <combo key="plant:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" />
                 <combo key="plant:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" />
@@ -5135,7 +5135,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=generator"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=generator" />
             <label text="Edit Power Generator" />
-            <space />
+            <space/>
             <key key="power" value="generator" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
@@ -5226,7 +5226,7 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=sub_station"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=sub_station" />
             <label text="Edit Power Sub Station" />
-            <space />
+            <space/>
             <key key="power" value="sub_station" />
             <text key="operator" text="Operator" />
             <text key="ref" text="Line reference" />
@@ -5238,7 +5238,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable_distribution_cabinet"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=cable_distribution_cabinet" />
             <label text="Edit Cable Distribution Cabinet" />
-            <space />
+            <space/>
             <key key="power" value="cable_distribution_cabinet" />
             <text key="operator" text="Operator" />
             <text key="ref" text="Reference" />
@@ -5255,7 +5255,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=tower"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=tower" />
             <label text="Edit Power Tower" />
-            <space />
+            <space/>
             <key key="power" value="tower" />
             <text key="operator" text="Operator" />
             <text key="ref" text="Tower reference" />
@@ -5271,7 +5271,7 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=pole"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=pole" />
             <label text="Edit Power Pole" />
-            <space />
+            <space/>
             <key key="power" value="pole" />
             <text key="operator" text="Operator" />
             <text key="ref" text="Pole reference" />
@@ -5287,7 +5287,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=line"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=line" />
             <label text="Edit Power Line" />
-            <space />
+            <space/>
             <combo key="power" text="Line type" values="line,minor_line" default="line" match="keyvalue" />
             <text key="operator" text="Operator" />
             <text key="ref" text="Line reference" />
@@ -5303,17 +5303,17 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=castle" />
             <label text="Edit Castle" />
-            <space />
+            <space/>
             <key key="historic" value="castle" />
             <text key="name" text="Name" />
             <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="Ruins" icon="presets/ruins.png" type="node,closedway">
             <label text="Edit Ruins" />
-            <space />
+            <space/>
             <key key="historic" value="ruins" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Archaeological Site" icon="styles/standard/sightseeing/archaeological.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
@@ -5322,10 +5322,10 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=archaeological_site"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=archaeological_site" />
             <label text="Edit Archaeological Site" />
-            <space />
+            <space/>
             <key key="historic" value="archaeological_site" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield"
@@ -5334,21 +5334,21 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=battlefield"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=battlefield" />
             <label text="Edit Battlefield" />
-            <space />
+            <space/>
             <key key="historic" value="battlefield" />
             <text key="name" text="Name" />
         </item>
         <item name="Palaeontological Site" icon="presets/palaeontological_site.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
             <label text="Edit Palaeontological Site" />
-            <space />
+            <space/>
             <key key="geological" value="palaeontological_site" />
             <text key="name" text="Name" />
         </item>
         <separator/>
         <item name="Monument" icon="presets/monument.png" type="node,closedway">
             <label text="Edit Monument" />
-            <space />
+            <space/>
             <key key="historic" value="monument" />
             <text key="name" text="Name" />
         </item>
@@ -5359,25 +5359,25 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=memorial"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=memorial" />
             <label text="Edit Memorial" />
-            <space />
+            <space/>
             <key key="historic" value="memorial" />
             <text key="name" text="Name" />
         </item>
         <item name="Wayside Cross" icon="presets/wayside_cross.png" type="node,closedway">
             <label text="Edit Wayside Cross" />
-            <space />
+            <space/>
             <key key="historic" value="wayside_cross" />
             <text key="name" text="Name" />
         </item>
         <item name="Wayside Shrine" icon="presets/wayside_shrine.png" type="node,closedway">
             <label text="Edit Wayside Shrine" />
-            <space />
+            <space/>
             <key key="historic" value="wayside_shrine" />
             <text key="name" text="Name" />
         </item>
         <item name="Boundary Stone" icon="styles/standard/historic/boundary_stone.png" type="node,closedway">
             <label text="Edit Boundary Stone" />
-            <space />
+            <space/>
             <key key="historic" value="boundary_stone" />
             <text key="name" text="Name" />
         </item>
@@ -5387,10 +5387,10 @@
     <group name="Food" icon="styles/standard/shop/supermarket.png">
         <item name="Supermarket" icon="styles/standard/shop/supermarket.png" type="node,closedway">
             <label text="Edit Supermarket" />
-            <space />
+            <space/>
             <key key="shop" value="supermarket" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Convenience Store" icon="presets/convenience.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience"
@@ -5398,10 +5398,10 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=convenience"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=convenience" />
             <label text="Edit Convenience Store" />
-            <space />
+            <space/>
             <key key="shop" value="convenience" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Kiosk" icon="presets/kiosk.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk"
@@ -5410,10 +5410,10 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=kiosk"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=kiosk" />
             <label text="Edit Kiosk" />
-            <space />
+            <space/>
             <key key="shop" value="kiosk" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <separator/>
         <item name="Baker" icon="presets/baker.png" type="node,closedway">
@@ -5426,10 +5426,10 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=bakery"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=bakery" />
             <label text="Edit Baker" />
-            <space />
+            <space/>
             <key key="shop" value="bakery" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Butcher" icon="presets/cow.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher"
@@ -5440,30 +5440,30 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=butcher"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=butcher" />
             <label text="Edit Butcher" />
-            <space />
+            <space/>
             <key key="shop" value="butcher" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Seafood" icon="presets/seafood.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=seafood"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=seafood" />
             <label text="Edit Seafood" />
-            <space />            
+            <space/>            
             <key key="shop" value="seafood" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Deli (Fine Food)" icon="presets/deli.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=deli"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=deli" />
             <label text="Edit Deli (Fine Food)" />
-            <space />
+            <space/>
             <key key="shop" value="deli" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>                     
         <item name="Confectionery" icon="presets/confectionery.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=confectionery"
@@ -5472,10 +5472,10 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=confectionery"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=confectionery" />
             <label text="Edit Confectionery" />
-            <space />
+            <space/>
             <key key="shop" value="confectionery" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <separator/>
         <item name="Marketplace" icon="styles/standard/place/marketplace.png" type="node,way,closedway">
@@ -5488,11 +5488,11 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=marketplace"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=marketplace" />
             <label text="Edit Marketplace" />
-            <space />            
+            <space/>            
             <key key="amenity" value="marketplace" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
             <text key="website" text="Website" />
         </item>     	
         <item name="Greengrocer" icon="presets/greengrocer.png" type="node,closedway">
@@ -5501,10 +5501,10 @@
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:shop=greengrocer"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=greengrocer" />
             <label text="Edit Greengrocer" />
-            <space />            
+            <space/>            
             <key key="shop" value="greengrocer" />
             <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" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
             <text key="website" text="Website" />
         </item>
         <item name="Farm Stand" icon="presets/apple.png" type="node,closedway">
@@ -5513,7 +5513,7 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=farm"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=farm" />
             <label text="Edit Farm Stand" />
-            <space />
+            <space/>
             <key key="shop" value="farm" />
             <text key="name" text="Name" />
             <text key="description" text="Description" />
@@ -5525,13 +5525,13 @@
         <item name="Organic" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Key:organic" />
             <label text="Edit Organic/Bio" />
-            <space />
+            <space/>
             <combo text="Organic/Bio" key="organic" values="no,yes,only" match="key" />
         </item>
         <item name="Fair Trade" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Key:fair_trade" />
             <label text="Edit Fair Trade" />
-            <space />
+            <space/>
             <combo text="Fair Trade" key="fair_trade" values="no,yes,only" match="key" />
         </item>
         <separator/>
@@ -5540,26 +5540,26 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=alcohol"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=alcohol" />
             <label text="Edit Alcohol Shop" />
-            <space />
+            <space/>
             <key key="shop" value="alcohol" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Beverages" icon="styles/standard/shop/beverages.png" type="node,closedway">
             <label text="Edit Beverages Shop" />
-            <space />
+            <space/>
             <key key="shop" value="beverages" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
     </group> <!-- Food -->
     <group name="Clothes" icon="styles/standard/shop/clothes.png">
         <item name="Clothes" icon="styles/standard/shop/clothes.png" type="node,closedway">
             <label text="Edit Clothes Shop" />
-            <space />
+            <space/>
             <key key="shop" value="clothes" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Boutique" icon="presets/boutique.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=boutique"
@@ -5567,35 +5567,35 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=boutique"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=boutique" />
             <label text="Edit Boutique" />
-            <space />
+            <space/>
             <key key="shop" value="boutique" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
          <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway">
             <label text="Edit Shoe Shop" />
-            <space />
+            <space/>
             <key key="shop" value="shoes" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Outdoor" icon="presets/tent.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=outdoor"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=outdoor" />
             <label text="Edit Outdoor Shop" />
-            <space />
+            <space/>
             <key key="shop" value="outdoor" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Sports" icon="presets/rowing.png" type="node,closedway">
             <label text="Edit Sports Shop" />
-            <space />
+            <space/>
             <key key="shop" value="sports" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <separator/>
         <item name="Dry Cleaning" icon="presets/laundry.png" type="node,closedway">
@@ -5604,86 +5604,86 @@
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=dry_cleaning"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=dry_cleaning" />
             <label text="Edit Dry Cleaning" />
-            <space />
+            <space/>
             <key key="shop" value="dry_cleaning" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Laundry" icon="presets/laundry.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
             <label text="Edit Laundry" />
-            <space />
+            <space/>
             <key key="shop" value="laundry" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Tailor" icon="styles/standard/shop/tailor.png" type="node,closedway">
             <label text="Edit Tailor" />
-            <space />
+            <space/>
             <key key="shop" value="tailor" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Fabric" icon="presets/fabric.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=fabric"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=fabric" />
-            <label text="Edit Fabric" />
-            <space />
+            <label text="Edit Fabric Store" />
+            <space/>
             <key key="shop" value="fabric" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
     </group> <!-- Clothes -->
     <group name="Electronic" icon="styles/standard/shop/electronics.png">
         <item name="Computer" icon="styles/standard/shop/computer.png" type="node,closedway">
             <label text="Edit Computer Shop" />
-            <space />
+            <space/>
             <key key="shop" value="computer" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway">
             <label text="Edit Electronics Shop" />
-            <space />
+            <space/>
             <key key="shop" value="electronics" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Mobile Phone" icon="presets/mobile_phone.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mobile_phone"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=mobile_phone"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=mobile_phone" />
-            <label text="Edit Mobile Phone" />
-            <space />
+            <label text="Edit Mobile Phone Shop" />
+            <space/>
             <key key="shop" value="mobile_phone" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Vacuum Cleaner" icon="presets/vacuum_cleaner.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=vacuum_cleaner"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=vacuum_cleaner" />
-            <label text="Edit Vacuum Cleaner" />
-            <space />
+            <label text="Edit Vacuum Cleaner Shop" />
+            <space/>
             <key key="shop" value="vacuum_cleaner" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Hifi" icon="styles/standard/shop/hifi.png" type="node,closedway">
             <label text="Edit Hifi Shop" />
-            <space />
+            <space/>
             <key key="shop" value="hifi" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Video" icon="styles/standard/shop/video.png" type="node,closedway">
             <label text="Edit Video Shop" />
-            <space />
+            <space/>
             <key key="shop" value="video" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
     </group> <!-- Electronic -->
     <group name="Cash" icon="presets/dollar.png">
@@ -5697,12 +5697,12 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bank"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bank" />
             <label text="Edit Bank" />
-            <space />
+            <space/>
             <key key="amenity" value="bank" />
             <text key="name" text="Name" />
             <text key="brand" text="Brand" />
             <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09: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">
@@ -5713,10 +5713,10 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bureau_de_change"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bureau_de_change" />
             <label text="Edit Money Exchange" />
-            <space />
+            <space/>
             <key key="amenity" value="bureau_de_change" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Automated Teller Machine" icon="styles/standard/money/atm.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm"
@@ -5730,21 +5730,21 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=atm"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=atm" />
             <label text="Edit Automated Teller Machine" />
-            <space />
+            <space/>
             <key key="amenity" value="atm" />
             <text key="brand" text="Brand" />
             <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Pawnbroker" icon="presets/pawnbroker.svg" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=pawnbroker"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=pawnbroker"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=pawnbroker" />
             <label text="Edit Pawnbroker" />
-            <space />
+            <space/>
             <key key="shop" value="pawnbroker" />
             <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" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
     </group> <!-- Cash -->
     <group name="Other" icon="styles/standard/shop/mall.png">
@@ -5755,11 +5755,11 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=department_store"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=department_store" />
             <label text="Edit Department Store" />
-            <space />
+            <space/>
             <key key="shop" value="department_store" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Mall" icon="styles/standard/shop/mall.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mall"
@@ -5767,43 +5767,43 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=mall"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=mall" />
             <label text="Edit Mall" />
-            <space />
+            <space/>
             <key key="shop" value="mall" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <separator/>
         <item name="Chemist" icon="styles/standard/shop/chemist.png" type="node,closedway">
             <label text="Edit Chemist" />
-            <space />
+            <space/>
             <key key="shop" value="chemist" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Hairdresser" icon="styles/standard/shop/hairdresser.png" type="node,closedway">
             <label text="Edit Hairdresser" />
-            <space />
+            <space/>
             <key key="shop" value="hairdresser" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway">
             <label text="Edit Optician" />
-            <space />
+            <space/>
             <key key="shop" value="optician" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Jewelry" icon="styles/standard/shop/jewelry.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=jewelry"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=jewelry" />
             <label text="Edit Jewelry" />
-            <space />
+            <space/>
             <key key="shop" value="jewelry" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Gift" icon="http://openclipart.org/people/secretlondon/secretlondon_chocolate_present.svg" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=gift"
@@ -5812,11 +5812,11 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=gift"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=gift" />
             <label text="Edit Gift Shop" />
-            <space />
+            <space/>
             <key key="shop" value="gift" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
             <optional>
                 <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" />
@@ -5825,12 +5825,12 @@
         <item name="Erotic" icon="presets/erotic.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=erotic"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=erotic" />
-            <label text="Edit Erotic" />
-            <space />
+            <label text="Edit Erotic Shop" />
+            <space/>
             <key key="shop" value="erotic" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <separator/>
         <item name="Florist" icon="styles/standard/shop/florist.png" type="node,closedway">
@@ -5841,10 +5841,10 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=florist"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=florist" />
             <label text="Edit Florist" />
-            <space />
+            <space/>
             <key key="shop" value="florist" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Garden Centre" icon="styles/standard/shop/garden_centre.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre"
@@ -5852,11 +5852,11 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=garden_centre"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=garden_centre" />
             <label text="Edit Garden Centre" />
-            <space />
+            <space/>
             <key key="shop" value="garden_centre" />
             <text key="name" text="Name" />
             <text key="brand" text="Brand" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <separator/>
         <item name="Do-it-yourself-store" icon="presets/diy_store.png" type="node,closedway">
@@ -5865,71 +5865,71 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=doityourself"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=doityourself" />
             <label text="Edit Do-it-yourself-store" />
-            <space />
+            <space/>
             <key key="shop" value="doityourself" />
             <text key="name" text="Name" />
             <text key="brand" text="Brand" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Hardware" icon="presets/hardware.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hardware" />
             <label text="Edit Hardware Store" />
-            <space />
+            <space/>
             <key key="shop" value="hardware" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Paint" icon="presets/paint.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=paint"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=paint" />
-            <label text="Edit Paint" />
-            <space />
+            <label text="Edit Paint Shop" />
+            <space/>
             <key key="shop" value="paint" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <separator/>
         <item name="Furniture" icon="styles/standard/shop/furniture.png" type="node,closedway">
             <label text="Edit Furniture Shop" />
-            <space />
+            <space/>
             <key key="shop" value="furniture" />
             <text key="name" text="Name" />
             <text key="brand" text="Brand" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Kitchen" icon="presets/kitchen.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kitchen"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=kitchen"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=kitchen" />
-            <label text="Edit Kitchen" />
-            <space />
+            <label text="Edit Kitchen Store" />
+            <space/>
             <key key="shop" value="kitchen" />
             <text key="name" text="Name" />
             <text key="brand" text="Brand" />
             <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Curtain" icon="presets/curtain.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=curtain"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=curtain" />
-            <label text="Edit Curtain" />
-            <space />
+            <label text="Edit Curtain Store" />
+            <space/>
             <key key="shop" value="curtain" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Frame" icon="presets/frame.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=frame"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=frame" />
-            <label text="Edit Frames" />
-            <space />
+            <label text="Edit Frames Store" />
+            <space/>
             <key key="shop" value="frame" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <separator/>
         <item name="Stationery" icon="presets/stationery.png" type="node,closedway">
@@ -5938,28 +5938,28 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=stationery"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=stationery" />
             <label text="Edit Stationery Shop" />
-            <space />
+            <space/>
             <key key="shop" value="stationery" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Copyshop" icon="presets/copyshop.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=copyshop"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=copyshop" />
             <label text="Edit Copyshop" />
-            <space />
+            <space/>
             <key key="shop" value="copyshop" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Book Store" icon="presets/book.png" type="node,closedway">
             <label text="Edit Book Store" />
-            <space />
+            <space/>
             <key key="shop" value="books" />
             <text key="name" text="Name" />
             <text key="brand" text="Brand" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Newsagent's shop" icon="presets/kiosk.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=newsagent"
@@ -5968,46 +5968,46 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=newsagent"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=newsagent" />
             <label text="Edit Newsagent's shop" />
-            <space />
+            <space/>
             <key key="shop" value="newsagent" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <separator/>
         <item name="Travel Agency" icon="presets/travel.png" type="node,closedway">
             <label text="Edit Travel Agency" />
-            <space />
+            <space/>
             <key key="shop" value="travel_agency" />
             <text key="name" text="Name" />
             <text key="brand" text="Brand" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Musical Instrument" icon="presets/musical_instrument.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=musical_instrument"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=musical_instrument" />
-            <label text="Edit Musical Instruments" />
-            <space />
+            <label text="Edit Musical Instruments Shop" />
+            <space/>
             <key key="shop" value="musical_instrument" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Toys" icon="styles/standard/shop/toys.png" type="node,closedway">
             <label text="Edit Toy Shop" />
-            <space />            
+            <space/>            
             <key key="shop" value="toys" />
             <text key="name" text="Name" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
         <item name="Variety Store" icon="presets/variety_store.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=variety_store"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=variety_store" />
             <label text="Edit Variety Store" />
-            <space />
+            <space/>
             <key key="shop" value="variety_store" />
             <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="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
         </item>
     </group> <!-- Other -->
     <item name="Vending machine" icon="presets/vending_machine.png" type="node">
@@ -6016,7 +6016,7 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=vending_machine"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=vending_machine" />
         <label text="Edit Vending machine" />
-        <space />            
+        <space/>            
         <key key="amenity" value="vending_machine" />
         <multiselect key="vending" text="Vending products" values="animal_food;bicycle_tube;cigarettes;condoms;drinks;excrement_bags;food;news_papers;parking_tickets;photos;public_transport_plans;public_transport_tickets;SIM-cards;stamps;sweets;tampons;telephone_vouchers;toys;vouchers" />
         <text key="operator" text="Operator" />
@@ -6034,31 +6034,31 @@
     <group name="Boundaries" icon="presets/boundaries.png">
         <item name="National" icon="presets/boundaries.png" type="closedway,relation">
             <label text="Edit National Boundary" />
-            <space />
+            <space/>
             <key key="boundary" value="national" />
             <text key="name" text="Name" />
         </item>
         <item name="Administrative" icon="presets/boundaries.png" type="closedway,relation">
             <label text="Edit Administrative Boundary" />
-            <space />
+            <space/>
             <key key="boundary" value="administrative" />
             <text key="name" text="Name" />
         </item>
         <item name="Civil" icon="presets/boundaries.png" type="closedway,relation">
             <label text="Edit Civil Boundary" />
-            <space />
+            <space/>
             <key key="boundary" value="civil" />
             <text key="name" text="Name" />
         </item>
         <item name="Political" icon="presets/boundaries.png" type="closedway,relation">
             <label text="Edit Political Boundary" />
-            <space />
+            <space/>
             <key key="boundary" value="political" />
             <text key="name" text="Name" />
         </item>
         <item name="National park" icon="presets/boundaries.png" type="closedway,relation">
             <label text="Edit National Park Boundary" />
-            <space />
+            <space/>
             <key key="boundary" value="national_park" />
             <text key="name" text="Name" />
         </item>
@@ -6066,35 +6066,35 @@
     <group name="Places" icon="presets/places.png">
         <item name="Continent" icon="presets/places.png" type="node,closedway">
             <label text="Edit Continent" />
-            <space />
+            <space/>
             <key key="place" value="continent" />
             <text key="name" text="Name" />
             <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="Country" icon="presets/places.png" type="node,closedway">
             <label text="Edit Country" />
-            <space />
+            <space/>
             <key key="place" value="country" />
             <text key="name" text="Name" />
             <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="State" icon="presets/places.png" type="node,closedway">
             <label text="Edit State" />
-            <space />
+            <space/>
             <key key="place" value="state" />
             <text key="name" text="Name" />
             <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="Region" icon="presets/places.png" type="node,closedway">
             <label text="Edit Region" />
-            <space />
+            <space/>
             <key key="place" value="region" />
             <text key="name" text="Name" />
             <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="County" icon="presets/places.png" type="node,closedway">
             <label text="Edit County" />
-            <space />
+            <space/>
             <key key="place" value="county" />
             <text key="name" text="Name" />
             <text key="wikipedia" text="Wikipedia" />
@@ -6105,7 +6105,7 @@
         <separator/>
         <item name="City" icon="presets/places.png" type="node,closedway">
             <label text="Edit City" />
-            <space />
+            <space/>
             <key key="place" value="city" />
             <text key="name" text="Name" />
             <text key="wikipedia" text="Wikipedia" />
@@ -6121,7 +6121,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=town"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=town" />
             <label text="Edit Town" />
-            <space />
+            <space/>
             <key key="place" value="town" />
             <text key="name" text="Name" />
             <text key="wikipedia" text="Wikipedia" />
@@ -6136,7 +6136,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=suburb"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=suburb" />
             <label text="Edit Suburb" />
-            <space />
+            <space/>
             <key key="place" value="suburb" />
             <text key="name" text="Name" />
             <text key="wikipedia" text="Wikipedia" />
@@ -6146,7 +6146,7 @@
         </item>
         <item name="Village" icon="presets/places.png" type="node,closedway">
             <label text="Edit Village" />
-            <space />
+            <space/>
             <key key="place" value="village" />
             <text key="name" text="Name" />
             <text key="wikipedia" text="Wikipedia" />
@@ -6156,7 +6156,7 @@
         </item>
         <item name="Hamlet" icon="presets/places.png" type="node,closedway">
             <label text="Edit Hamlet" />
-            <space />
+            <space/>
             <key key="place" value="hamlet" />
             <text key="name" text="Name" />
             <text key="wikipedia" text="Wikipedia" />
@@ -6166,7 +6166,7 @@
         </item>
         <item name="Isolated Dwelling" icon="presets/places.png" type="node,closedway">
             <label text="Edit Isolated Dwelling" />
-            <space />
+            <space/>
             <key key="place" value="isolated_dwelling" />
             <text key="name" text="Name" />
             <text key="wikipedia" text="Wikipedia" />
@@ -6181,7 +6181,7 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=neighbourhood"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=neighbourhood" />
             <label text="Edit Neighbourhood" />
-            <space />
+            <space/>
             <key key="place" value="neighbourhood" />
             <text key="name" text="Name" />
             <text key="wikipedia" text="Wikipedia" />
@@ -6196,7 +6196,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=locality"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=locality" />
             <label text="Edit Locality" />
-            <space />
+            <space/>
             <key key="place" value="locality" />
             <text key="name" text="Name" />
             <text key="wikipedia" text="Wikipedia" />
@@ -6209,17 +6209,30 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=peak"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=peak" />
             <label text="Edit Peak" />
-            <space />
+            <space/>
             <key key="natural" value="peak" />
             <text key="name" text="Name" />
             <text key="ele" text="Elevation" />
             <text key="wikipedia" text="Wikipedia" />
         </item>
+        <item name="Saddle" icon="http://wiki.openstreetmap.org/w/images/c/ca/Saddle.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=saddle"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=saddle"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=saddle"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=saddle" />
+            <label text="Edit Saddle" />
+            <space/>
+            <key key="natural" value="saddle" />
+            <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=glacier"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=glacier" />
             <label text="Edit Glacier" />
-            <space />
+            <space/>
             <key key="natural" value="glacier" />
             <text key="name" text="Name" />
             <text key="ele" text="Elevation" />
@@ -6230,7 +6243,7 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=volcano"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=volcano" />
             <label text="Edit Volcano" />
-            <space />
+            <space/>
             <key key="natural" value="volcano" />
             <text key="name" text="Name" />
             <text key="ele" text="Elevation" />
@@ -6240,7 +6253,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=cave_entrance" />
             <label text="Edit Cave Entrance" />
-            <space />
+            <space/>
             <key key="natural" value="cave_entrance" />
             <text key="name" text="Name" />
             <text key="wikipedia" text="Wikipedia" />
@@ -6253,7 +6266,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=island"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=island" />
             <label text="Edit Island" />
-            <space />
+            <space/>
             <key key="place" value="island" />
             <text key="name" text="Name" />
             <text key="wikipedia" text="Wikipedia" />
@@ -6264,7 +6277,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=islet"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=islet" />
             <label text="Edit Islet" />
-            <space />
+            <space/>
             <key key="place" value="islet" />
             <text key="name" text="Name" />
             <text key="wikipedia" text="Wikipedia" />
@@ -6280,7 +6293,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=tree"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=tree" />
             <label text="Edit Tree" />
-            <space />
+            <space/>
             <key key="natural" value="tree" />
             <text key="name" text="Name" />
             <combo key="type" text="Type" values="broad_leaved,conifer,palm" />
@@ -6308,7 +6321,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=wood"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=wood" />
             <label text="Edit Wood" />
-            <space />
+            <space/>
             <key key="natural" value="wood" />
             <text key="name" text="Name" />
             <combo key="wood" text="Type" values="coniferous,deciduous,mixed" />
@@ -6321,7 +6334,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=forest"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=forest" />
             <label text="Edit Forest Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="forest" />
             <text key="name" text="Name" />
             <combo key="wood" text="Type" values="coniferous,deciduous,mixed" />
@@ -6334,21 +6347,21 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=grassland"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=grassland" />
             <label text="Edit Grassland" />
-            <space />
+            <space/>
             <key key="natural" value="grassland" />
             <text key="name" text="Name" />
             <combo key="grassland" text="Type" values="pampas,prairie,puszta,savanna,steppe,veld" />
         </item>
         <item name="Nature Reserve" icon="styles/standard/leisure/nature_reserve.png" type="node,closedway,relation">
             <label text="Edit Nature Reserve" />
-            <space />
+            <space/>
             <key key="leisure" value="nature_reserve" />
             <text key="name" text="Name" />
         </item>
         <separator/>
         <item name="Scree" icon="presets/empty.png" type="node,closedway,relation">
             <label text="Edit Scree" />
-            <space />
+            <space/>
             <key key="natural" value="scree" />
             <text key="name" text="Name" />
         </item>
@@ -6358,13 +6371,13 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=fell"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=fell" />
             <label text="Edit Fell" />
-            <space />
+            <space/>
             <key key="natural" value="fell" />
             <text key="name" text="Name" />
         </item>
         <item name="Scrub" icon="presets/empty.png" type="node,closedway,relation">
             <label text="Edit Scrub" />
-            <space />
+            <space/>
             <key key="natural" value="scrub" />
             <text key="name" text="Name" />
         </item>
@@ -6375,7 +6388,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=heath"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=heath" />
             <label text="Edit Heath" />
-            <space />
+            <space/>
             <key key="natural" value="heath" />
             <text key="name" text="Name" />
         </item>
@@ -6388,19 +6401,19 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=farmyard"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=farmyard" />
             <label text="Edit Farmyard Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="farmyard" />
             <text key="name" text="Name" />
         </item>
         <item name="Farmland" icon="presets/landuse.png" type="closedway,relation">
             <label text="Edit Farmland Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="farmland" />
             <text key="name" text="Name" />
         </item>
         <item name="Meadow" icon="presets/landuse.png" type="node,closedway,relation">
             <label text="Edit Meadow Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="meadow" />
             <text key="name" text="Name" />
         </item>
@@ -6412,13 +6425,13 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=orchard"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=orchard" />
             <label text="Edit Orchard Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="orchard" />
             <text key="name" text="Name" />
         </item>
         <item name="Vineyard" icon="presets/fruits.png" type="node,closedway,relation">
             <label text="Edit Vineyard Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="vineyard" />
             <text key="name" text="Name" />
         </item>
@@ -6428,27 +6441,27 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=greenhouse_horticulture"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=greenhouse_horticulture" />
             <label text="Edit Greenhouse Horticulture" />
-            <space />            
+            <space/>            
             <key key="landuse" value="greenhouse_horticulture" />
             <text key="name" text="Name" /> 
             <text key="operator" text="Operator" />                                                                
         </item>        
         <item name="Allotments" icon="presets/landuse.png" type="node,closedway,relation">
             <label text="Edit Allotments Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="allotments" />
             <text key="name" text="Name" />
         </item>
         <separator/>
         <item name="Garden" icon="presets/empty.png" type="node,closedway,relation">
             <label text="Edit Garden" />
-            <space />
+            <space/>
             <key key="leisure" value="garden" />
             <text key="name" text="Name" />
         </item>
         <item name="Grass" icon="presets/landuse.png" type="node,closedway,relation">
             <label text="Edit Grass Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="grass" />
             <text key="name" text="Name" />
         </item>
@@ -6458,7 +6471,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=village_green"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=village_green" />
             <label text="Edit Village Green Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="village_green" />
             <text key="name" text="Name" />
         </item>
@@ -6466,13 +6479,13 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=common" />
             <label text="Edit Common" />
-            <space />
+            <space/>
             <key key="leisure" value="common" />
             <text key="name" text="Name" />
         </item>
         <item name="Park" icon="presets/empty.png" type="node,closedway,relation">
             <label text="Edit Park" />
-            <space />
+            <space/>
             <key key="leisure" value="park" />
             <text key="name" text="Name" />
         </item>
@@ -6483,14 +6496,14 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=recreation_ground"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=recreation_ground" />
             <label text="Edit Recreation Ground Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="recreation_ground" />
             <text key="name" text="Name" />
         </item>
         <separator/>
         <item name="Residential Area" icon="styles/standard/misc/landmark/building.png" type="closedway,relation">
             <label text="Edit Residential Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="residential" />
             <text key="name" text="Name" />
         </item>
@@ -6503,7 +6516,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=grave_yard"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=grave_yard" />
             <label text="Edit Graveyard" />
-            <space />
+            <space/>
             <key key="amenity" value="grave_yard" />
             <text key="name" text="Name" />
             <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
@@ -6519,7 +6532,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=cemetery"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=cemetery" />
             <label text="Edit Cemetery Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="cemetery" />
             <text key="name" text="Name" />
             <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
@@ -6527,19 +6540,19 @@
         </item>
         <item name="Retail" icon="styles/standard/shop/supermarket.png" type="node,closedway,relation">
             <label text="Edit Retail Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="retail" />
             <text key="name" text="Name" />
         </item>
         <item name="Commercial" icon="presets/empty.png" type="node,closedway,relation">
             <label text="Edit Commercial Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="commercial" />
             <text key="name" text="Name" />
         </item>
         <item name="Industrial" icon="presets/works.png" type="node,closedway,relation">
             <label text="Edit Industrial Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="industrial" />
             <text key="name" text="Name" />
         </item>
@@ -6551,7 +6564,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=garages"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=garages" />
             <label text="Edit Garages" />
-            <space />            
+            <space/>            
             <key key="landuse" value="garages" />
             <text key="name" text="Name" />                                                    
             <text key="operator" text="Operator" />
@@ -6562,44 +6575,44 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=railway"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=railway" />
             <label text="Edit Railway Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="railway" />
             <text key="name" text="Name" />
         </item>
         <item name="Military" icon="presets/military.png" type="node,closedway,relation">
             <label text="Edit Military Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="military" />
             <text key="name" text="Name" />
         </item>
         <separator/>
         <item name="Construction area" icon="presets/construction.png" type="node,closedway,relation">
             <label text="Edit Construction Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="construction" />
             <text key="name" text="Name" />
         </item>
         <item name="Brownfield" icon="presets/landuse.png" type="node,closedway,relation">
             <label text="Edit Brownfield Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="brownfield" />
             <text key="name" text="Name" />
         </item>
         <item name="Greenfield" icon="presets/landuse.png" type="node,closedway,relation">
             <label text="Edit Greenfield Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="greenfield" />
             <text key="name" text="Name" />
         </item>
         <item name="Landfill" icon="presets/landuse.png" type="node,closedway,relation">
             <label text="Edit Landfill Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="landfill" />
             <text key="name" text="Name" />
         </item>
         <item name="Quarry" icon="presets/mine.png" type="node,closedway,relation">
             <label text="Edit Quarry Landuse" />
-            <space />
+            <space/>
             <key key="landuse" value="quarry" />
             <text key="name" text="Name" />
         </item>
@@ -6610,7 +6623,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
                   de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
             <label text="Edit Address Information" />
-            <space />
+            <space/>
             <text key="addr:housenumber" text="House number" match="key" auto_increment="-2,-1,+1,+2" />
             <optional>
                 <text key="addr:housename" text="House name" match="key" />
@@ -6624,30 +6637,30 @@
            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
                  de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
             <label text="Edit Address Interpolation" />
-            <space />
+            <space/>
             <combo key="addr:interpolation" text="Numbering scheme" values="odd,even,all,alphabetic" default="odd" match="key" />
         </item>
         <item name="Contact (common schema)" icon="presets/contact.png" type="node,way,closedway,relation">
             <label text="Edit Contact information" />
-            <space />
+            <space/>
             <text key="phone" text="Phone Number" match="key" />
             <text key="fax" text="Fax Number" match="key" />
-            <space />
+            <space/>
             <text key="website" text="Website" match="key" />
             <text key="email" text="Email Address" match="key" />
-            <space />
+            <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 />
+            <space/>
             <text key="contact:phone" text="Phone Number" match="key" />
             <text key="contact:fax" text="Fax Number" match="key" />
-            <space />
+            <space/>
             <text key="contact:website" text="Website" match="key" />
             <text key="contact:email" text="Email Address" match="key" />
-            <space />
+            <space/>
             <text key="wikipedia" text="Wikipedia" />
             <text key="image" text="Image" />
         </item>
@@ -6680,7 +6693,7 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:boundary"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:boundary" />
             <label text="Edit Boundary" />
-            <space />
+            <space/>
             <key key="type" value="boundary" />
             <text key="name" text="Name" />
             <optional>
@@ -6696,9 +6709,9 @@
             </roles>
         </item>
         <item name="Site" type="relation">
-            <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Site"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Site" />
             <label text="Edit Site" />
-            <space />
+            <space/>
             <key key="type" value="site" />
             <text key="name" text="Site name" />
             <roles>
@@ -6718,9 +6731,9 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:restriction"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:restriction"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Relation:restriction"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:restriction"/>
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:restriction" />
             <label text="Edit Turn Restriction" />
-            <space />
+            <space/>
             <key key="type" value="restriction" />
             <combo key="restriction" text="Restriction" values="no_left_turn,no_right_turn,no_straight_on,no_u_turn,only_right_turn,only_left_turn,only_straight_on" />
             <optional>
@@ -6737,9 +6750,9 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:enforcement"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:enforcement"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:enforcement"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:enforcement"/>
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:enforcement" />
             <label text="Edit Enforcement" />
-            <space />
+            <space/>
             <key key="type" value="enforcement" />
             <combo key="enforcement" text="Type of enforcement" values="maxheight,maxweight,maxspeed,mindistance,traffic_signals,check " />
             <text key="maxheight" text="Max. height (meters, only if enforcement=maxheight)" />
@@ -6760,11 +6773,11 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:route"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Relation:route"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:route"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:route"/>
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:route" />
             <label text="Edit general route" />
-            <space />
+            <space/>
             <key key="type" value="route" />
-            <combo key="route" text="Route type" values="bicycle,bus,road,ferry,ski,foot,hiking,tram,detour,railway,subway" values_context="route type"/>
+            <combo key="route" text="Route type" values="bicycle,bus,road,ferry,ski,foot,hiking,tram,detour,railway,subway" values_context="route type" />
             <text key="name" text="Name" />
             <text key="ref" text="Reference" />
             <text key="symbol" text="Symbol description" />
@@ -6789,9 +6802,9 @@
             </roles>
         </item>
         <item name="Route Network" icon="presets/path.png" type="relation">
-            <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network" />
             <label text="Edit Route Network" />
-            <space />
+            <space/>
             <key key="type" value="network" />
             <text key="name" text="Name" />
             <optional>
@@ -6807,9 +6820,9 @@
             <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:associatedStreet"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:associatedStreet"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:associatedStreet"/>
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:associatedStreet" />
             <label text="Edit Associated Street" />
-            <space />
+            <space/>
             <key key="type" value="associatedStreet" />
             <text key="name" text="Street name" />
             <roles>
@@ -6819,9 +6832,9 @@
         </item>
         <item name="Street" type="relation">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:street"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:street"/>
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:street" />
             <label text="Edit Street" />
-            <space />
+            <space/>
             <key key="type" value="street" />
             <text key="name" text="Name" />
             <roles>
@@ -6837,9 +6850,9 @@
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:destination_sign"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:destination_sign"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:destination_sign"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:destination_sign"/>
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:destination_sign" />
             <label text="Edit Destination Sign" />
-            <space />
+            <space/>
             <key key="type" value="destination_sign" />
             <text key="destination" text="Destination written on sign (w/o distance)" />
             <text key="distance" text="Distance (km)" />
@@ -6856,9 +6869,9 @@
         </item>
         <separator/>
         <item name="Waterway" icon="presets/river.png" type="relation">
-            <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Waterway"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Waterway" />
             <label text="Edit Waterway" />
-            <space />
+            <space/>
             <key key="type" value="waterway" />
             <combo key="waterway" text="Subtype of waterway (largest one of members)" values="river,stream,canal,drain,ditch" />
             <text key="name" text="Name" />
@@ -6875,15 +6888,15 @@
             <roles>
                 <role key="" text="waterways (no riverbank)" requisite="optional" type="way" member_expression="waterway -waterway:riverbank" />
                 <role key="main_stream" text="waterways (no riverbank)" requisite="optional" type="way" member_expression="waterway -waterway:riverbank" />
-                <role key="side_stream" text="branch waterways (no riverbank)" requisite="optional" type="way" member_expression="waterway -waterway:riverbank"/>
+                <role key="side_stream" text="branch waterways (no riverbank)" requisite="optional" type="way" member_expression="waterway -waterway:riverbank" />
                 <role key="spring" text="spring of waterway" requisite="optional" type="node" />
             </roles>
         </item>
         <item name="Bridge" icon="presets/bridge.png" type="relation">
             <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relations/Proposed/Bridges_and_Tunnels"/>
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relations/Proposed/Bridges_and_Tunnels" />
             <label text="Edit Bridge" />
-            <space />
+            <space/>
             <key key="type" value="bridge" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
             <text key="name" text="Name" />
@@ -6899,9 +6912,9 @@
             </roles>
         </item>
         <item name="Tunnel" icon="presets/tunnel.png" type="relation">
-            <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels" />
             <label text="Edit Tunnel" />
-            <space />
+            <space/>
             <key key="type" value="tunnel" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
             <text key="name" text="Name" />