Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 3420)
+++ trunk/data/defaultpresets.xml	(revision 3428)
@@ -1340,5 +1340,5 @@
             <optional>
                 <text key="name" text="Name" default="" delete_if_empty="true" />
-                <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+                <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
                 <label text="Fuel types:" />
                 <check key="fuel:diesel" text="Diesel" default="off" delete_if_empty="true" />
@@ -1598,5 +1598,5 @@
             <space />
             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
@@ -1616,5 +1616,5 @@
             <space />
             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
@@ -1632,5 +1632,5 @@
             <space />
             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
@@ -1649,5 +1649,5 @@
             <space />
             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
@@ -1667,5 +1667,5 @@
             <space />
             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
@@ -1684,5 +1684,5 @@
             <space />
             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
@@ -1700,5 +1700,5 @@
             <space />
             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
@@ -1717,5 +1717,5 @@
             <space />
             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
@@ -1736,9 +1736,9 @@
             <combo key="cuisine" text="Cuisine" values="italian,chinese,pizza,burger,greek,german,indian,regional,kebab,turkish,asian,thai,mexican,japanese,french,sandwich,sushi" default="" delete_if_empty="true" />
             <check key="microbrewery" text="Microbrewery" default="off" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" default="" delete_if_empty="true" />
             <space />
             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
@@ -1756,8 +1756,8 @@
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
             <combo key="cuisine" text="Cuisine" values="italian,chinese,pizza,burger,greek,german,indian,regional,kebab,turkish,asian,thai,mexican,japanese,french,sandwich,sushi,fish_and_chips,chicken" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
             <space />
             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
@@ -1773,8 +1773,8 @@
             <key key="amenity" value="food_court" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
             <space />
             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
@@ -1791,8 +1791,8 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
             <space />
             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
@@ -1810,8 +1810,8 @@
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
             <check key="microbrewery" text="Microbrewery" default="off" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
             <space />
             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
@@ -1826,8 +1826,8 @@
             <key key="amenity" value="biergarten" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
             <space />
             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
@@ -1843,8 +1843,8 @@
             <key key="amenity" value="bar" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
             <space />
             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" default="" delete_if_empty="true" />
             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
@@ -1860,5 +1860,5 @@
             <key key="amenity" value="nightclub" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
             <space />
             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
@@ -1883,5 +1883,5 @@
             <key key="tourism" value="museum" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Zoo" icon="presets/zoo.png" type="node,closedway">
@@ -1891,5 +1891,5 @@
             <key key="tourism" value="zoo" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Viewpoint" icon="presets/viewpoint.png" type="node,closedway">
@@ -1904,5 +1904,5 @@
             <key key="tourism" value="theme_park" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway">
@@ -1918,5 +1918,5 @@
             <key key="information" value="office" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Map" icon="presets/map.png" type="node">
@@ -2019,5 +2019,5 @@
             <key key="historic" value="ruins" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Archaeological Site" icon="presets/historic.png" type="node,closedway">
@@ -2027,5 +2027,5 @@
             <key key="historic" value="archaeological_site" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway">
@@ -2130,5 +2130,5 @@
             <key key="leisure" value="golf_course" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Miniature Golf" icon="presets/golf.png" type="node,closedway">
@@ -2136,5 +2136,5 @@
             <key key="leisure" value="miniature_golf" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
     </group>
@@ -2467,5 +2467,5 @@
             <key key="amenity" value="library" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,relation">
@@ -2491,5 +2491,5 @@
             <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" default="" delete_if_empty="true" />
             <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <separator/>
@@ -2754,5 +2754,5 @@
             <key key="shop" value="supermarket" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Chemist" icon="presets/empty.png" type="node,closedway">
@@ -2760,5 +2760,5 @@
             <key key="shop" value="chemist" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Convenience Store" icon="presets/empty.png" type="node,closedway">
@@ -2767,5 +2767,5 @@
             <key key="shop" value="convenience" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Kiosk" icon="presets/kiosk.png" type="node,closedway">
@@ -2774,5 +2774,5 @@
             <key key="shop" value="kiosk" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Book Store" icon="presets/book.png" type="node,closedway">
@@ -2780,5 +2780,5 @@
             <key key="shop" value="books" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Travel Agency" icon="presets/travel.png" type="node,closedway">
@@ -2786,5 +2786,5 @@
             <key key="shop" value="travel_agency" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Butcher" icon="presets/cow.png" type="node,closedway">
@@ -2793,5 +2793,5 @@
             <key key="shop" value="butcher" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Baker" icon="presets/baker.png" type="node,closedway">
@@ -2800,5 +2800,5 @@
             <key key="shop" value="bakery" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Florist" icon="presets/empty.png" type="node,closedway">
@@ -2807,5 +2807,5 @@
             <key key="shop" value="florist" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Organic" icon="presets/empty.png" type="node,closedway">
@@ -2813,5 +2813,5 @@
             <key key="shop" value="organic" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Alcohol" icon="presets/empty.png" type="node,closedway">
@@ -2820,5 +2820,5 @@
             <key key="shop" value="alcohol" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Beverages" icon="presets/empty.png" type="node,closedway">
@@ -2826,5 +2826,5 @@
             <key key="shop" value="beverages" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Computer" icon="presets/empty.png" type="node,closedway">
@@ -2832,5 +2832,5 @@
             <key key="shop" value="computer" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Electronics" icon="presets/empty.png" type="node,closedway">
@@ -2838,5 +2838,5 @@
             <key key="shop" value="electronics" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Hifi" icon="presets/empty.png" type="node,closedway">
@@ -2844,5 +2844,5 @@
             <key key="shop" value="hifi" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Furniture" icon="presets/empty.png" type="node,closedway">
@@ -2850,5 +2850,5 @@
             <key key="shop" value="furniture" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Garden Centre" icon="presets/empty.png" type="node,closedway">
@@ -2857,5 +2857,5 @@
             <key key="shop" value="garden_centre" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Hardware" icon="presets/empty.png" type="node,closedway">
@@ -2864,5 +2864,5 @@
             <key key="shop" value="hardware" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Do-it-yourself-store" icon="presets/diy_store.png" type="node,closedway">
@@ -2871,5 +2871,5 @@
             <key key="shop" value="doityourself" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Stationery" icon="presets/empty.png" type="node,closedway">
@@ -2877,5 +2877,5 @@
             <key key="shop" value="stationery" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Hairdresser" icon="presets/empty.png" type="node,closedway">
@@ -2883,5 +2883,5 @@
             <key key="shop" value="hairdresser" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Shoes" icon="presets/empty.png" type="node,closedway">
@@ -2889,5 +2889,5 @@
             <key key="shop" value="shoes" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Toys" icon="presets/empty.png" type="node,closedway">
@@ -2895,5 +2895,5 @@
             <key key="shop" value="toys" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Video" icon="presets/empty.png" type="node,closedway">
@@ -2901,5 +2901,5 @@
             <key key="shop" value="video" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Dry Cleaning" icon="presets/laundry.png" type="node,closedway">
@@ -2908,5 +2908,5 @@
             <key key="shop" value="dry_cleaning" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Laundry" icon="presets/laundry.png" type="node,closedway">
@@ -2915,5 +2915,5 @@
             <key key="shop" value="laundry" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Outdoor" icon="presets/tent.png" type="node,closedway">
@@ -2922,5 +2922,5 @@
             <key key="shop" value="outdoor" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Sports" icon="presets/empty.png" type="node,closedway">
@@ -2928,5 +2928,5 @@
             <key key="shop" value="sports" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Optician" icon="presets/empty.png" type="node,closedway">
@@ -2934,5 +2934,5 @@
             <key key="shop" value="optician" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <separator/>
@@ -2960,5 +2960,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
             <check key="atm" text="Automated Teller Machine" default="on" delete_if_empty="true" />
         </item>
@@ -2968,5 +2968,5 @@
             <key key="amenity" value="bureau_de_change" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Automated Teller Machine" icon="presets/cash.png" type="node">
@@ -2983,5 +2983,5 @@
             <key key="amenity" value="doctors" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Dentist" icon="presets/empty.png" type="node,closedway">
@@ -2989,5 +2989,5 @@
             <key key="amenity" value="dentist" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Pharmacy" icon="presets/pharmacy.png" type="node,closedway">
@@ -2997,5 +2997,5 @@
             <combo key="dispensing" text="Dispensing" values="yes,no" default="no" delete_if_empty="true" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
         <item name="Hospital" icon="presets/hospital.png" type="node,closedway">
@@ -3024,5 +3024,5 @@
             <key key="amenity" value="veterinary" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
     </group> <!-- Health -->