Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 1539)
+++ /trunk/styles/standard/elemstyles.xml	(revision 1540)
@@ -1114,4 +1114,5 @@
 	<rule>
 		<condition k="railway" v="platform"/>
+		<icon annotate="true" src="misc/deprecated.png"/>
 		<line width="2" colour="rail#404040"/>
 		<area colour="rail#404040"/>
@@ -1203,4 +1204,12 @@
 
 	<rule>
+		<condition k="aerialway" v="gondola"/>
+		<line width="1" colour="aerialway#663300" dashed="9"/>
+		<icon annotate="true" src="transport/aerialway/cable_car.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="aerialway" v="chair_lift"/>
 		<line width="1" colour="aerialway#663300" dashed="6"/>
@@ -1222,12 +1231,4 @@
 		<area colour="aerialway#663300"/>
 		<icon annotate="true" src="transport/aerialway/station.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="aerialway" v="gondola"/>
-		<line width="1" colour="aerialway#663300" dashed="9"/>
-		<icon annotate="true" src="transport/aerialway/cable_car.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1970,5 +1971,5 @@
 	<rule>
 		<condition k="religion" v="unitarian"/>
-		<icon annotate="true" src="religion/taoism.png"/>
+		<icon annotate="true" src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1977,5 +1978,5 @@
 	<rule>
 		<condition k="religion" v="zoroastrian"/>
-		<icon annotate="true" src="religion/taoism.png"/>
+		<icon annotate="true" src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3202,4 +3203,5 @@
 		<condition k="natural" v="marsh"/>
 		<icon src="misc/deprecated.png"/>
+		<line dashed="true" colour="deprecated#ff0000"/>
 		<area colour="deprecated#ff0000"/>
 		<scale_min>1</scale_min>
Index: /trunk/styles/standard/overview.osm
===================================================================
--- /trunk/styles/standard/overview.osm	(revision 1539)
+++ /trunk/styles/standard/overview.osm	(revision 1540)
@@ -687,6 +687,6 @@
   </way>
   <node id="-46000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00060">
-    <tag k="highway" v="minor"/>
-    <tag k="name" v="minor"/>
+    <tag k="highway" v="emergency_access_point"/>
+    <tag k="name" v="emergency_access_point"/>
   </node>
   <node id="-46001" user="overview-creator" visible="true" lat="-0.00296" lon="0.00056"/>
@@ -700,10 +700,10 @@
     <nd ref="-46004"/>
     <nd ref="-46001"/>
+    <tag k="highway" v="emergency_access_point"/>
+    <tag k="name" v="emergency_access_point"/>
+  </way>
+  <node id="-46200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00060">
     <tag k="highway" v="minor"/>
     <tag k="name" v="minor"/>
-  </way>
-  <node id="-46200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00060">
-    <tag k="highway" v="stile"/>
-    <tag k="name" v="stile"/>
   </node>
   <node id="-46201" user="overview-creator" visible="true" lat="-0.00306" lon="0.00056"/>
@@ -717,4 +717,21 @@
     <nd ref="-46204"/>
     <nd ref="-46201"/>
+    <tag k="highway" v="minor"/>
+    <tag k="name" v="minor"/>
+  </way>
+  <node id="-46400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00060">
+    <tag k="highway" v="stile"/>
+    <tag k="name" v="stile"/>
+  </node>
+  <node id="-46401" user="overview-creator" visible="true" lat="-0.00316" lon="0.00056"/>
+  <node id="-46402" user="overview-creator" visible="true" lat="-0.00316" lon="0.00084"/>
+  <node id="-46403" user="overview-creator" visible="true" lat="-0.00324" lon="0.00084"/>
+  <node id="-46404" user="overview-creator" visible="true" lat="-0.00324" lon="0.00056"/>
+  <way id="-46404" user="overview-creator" visible="true">
+    <nd ref="-46401"/>
+    <nd ref="-46402"/>
+    <nd ref="-46403"/>
+    <nd ref="-46404"/>
+    <nd ref="-46401"/>
     <tag k="highway" v="stile"/>
     <tag k="name" v="stile"/>
@@ -900,6 +917,23 @@
   <node id="-43000" user="overview-creator" visible="true" lat="-0.00150" lon="0.00060">
     <tag k="tourism" v="information"/>
-    <tag k="name" v="surface"/>
-  </node>
+    <tag k="name" v="direction"/>
+  </node>
+  <node id="-43200" user="overview-creator" visible="true" lat="-0.00160" lon="0.00060">
+    <tag k="direction" v="clockwise"/>
+    <tag k="name" v="clockwise"/>
+  </node>
+  <node id="-43201" user="overview-creator" visible="true" lat="-0.00156" lon="0.00056"/>
+  <node id="-43202" user="overview-creator" visible="true" lat="-0.00156" lon="0.00084"/>
+  <node id="-43203" user="overview-creator" visible="true" lat="-0.00164" lon="0.00084"/>
+  <node id="-43204" user="overview-creator" visible="true" lat="-0.00164" lon="0.00056"/>
+  <way id="-43204" user="overview-creator" visible="true">
+    <nd ref="-43201"/>
+    <nd ref="-43202"/>
+    <nd ref="-43203"/>
+    <nd ref="-43204"/>
+    <nd ref="-43201"/>
+    <tag k="direction" v="clockwise"/>
+    <tag k="name" v="clockwise"/>
+  </way>
   <node id="-44200" user="overview-creator" visible="true" lat="-0.00210" lon="0.00060">
     <tag k="tourism" v="information"/>
@@ -2242,4 +2276,21 @@
     <tag k="name" v="turntable"/>
   </way>
+  <node id="-104000" user="overview-creator" visible="true" lat="-0.00200" lon="0.00150">
+    <tag k="railway" v="platform"/>
+    <tag k="name" v="platform"/>
+  </node>
+  <node id="-104001" user="overview-creator" visible="true" lat="-0.00196" lon="0.00146"/>
+  <node id="-104002" user="overview-creator" visible="true" lat="-0.00196" lon="0.00174"/>
+  <node id="-104003" user="overview-creator" visible="true" lat="-0.00204" lon="0.00174"/>
+  <node id="-104004" user="overview-creator" visible="true" lat="-0.00204" lon="0.00146"/>
+  <way id="-104004" user="overview-creator" visible="true">
+    <nd ref="-104001"/>
+    <nd ref="-104002"/>
+    <nd ref="-104003"/>
+    <nd ref="-104004"/>
+    <nd ref="-104001"/>
+    <tag k="railway" v="platform"/>
+    <tag k="name" v="platform"/>
+  </way>
   <node id="-104200" user="overview-creator" visible="true" lat="-0.00210" lon="0.00150">
     <tag k="tourism" v="information"/>
@@ -2565,6 +2616,6 @@
   </way>
   <node id="-122400" user="overview-creator" visible="true" lat="-0.00120" lon="0.00180">
-    <tag k="aerialway" v="chair_lift"/>
-    <tag k="name" v="chair_lift"/>
+    <tag k="aerialway" v="gondola"/>
+    <tag k="name" v="gondola"/>
   </node>
   <node id="-122401" user="overview-creator" visible="true" lat="-0.00116" lon="0.00176"/>
@@ -2578,10 +2629,10 @@
     <nd ref="-122404"/>
     <nd ref="-122401"/>
+    <tag k="aerialway" v="gondola"/>
+    <tag k="name" v="gondola"/>
+  </way>
+  <node id="-122600" user="overview-creator" visible="true" lat="-0.00130" lon="0.00180">
     <tag k="aerialway" v="chair_lift"/>
     <tag k="name" v="chair_lift"/>
-  </way>
-  <node id="-122600" user="overview-creator" visible="true" lat="-0.00130" lon="0.00180">
-    <tag k="aerialway" v="drag_lift"/>
-    <tag k="name" v="drag_lift"/>
   </node>
   <node id="-122601" user="overview-creator" visible="true" lat="-0.00126" lon="0.00176"/>
@@ -2595,10 +2646,10 @@
     <nd ref="-122604"/>
     <nd ref="-122601"/>
+    <tag k="aerialway" v="chair_lift"/>
+    <tag k="name" v="chair_lift"/>
+  </way>
+  <node id="-122800" user="overview-creator" visible="true" lat="-0.00140" lon="0.00180">
     <tag k="aerialway" v="drag_lift"/>
     <tag k="name" v="drag_lift"/>
-  </way>
-  <node id="-122800" user="overview-creator" visible="true" lat="-0.00140" lon="0.00180">
-    <tag k="aerialway" v="station"/>
-    <tag k="name" v="station"/>
   </node>
   <node id="-122801" user="overview-creator" visible="true" lat="-0.00136" lon="0.00176"/>
@@ -2612,10 +2663,10 @@
     <nd ref="-122804"/>
     <nd ref="-122801"/>
+    <tag k="aerialway" v="drag_lift"/>
+    <tag k="name" v="drag_lift"/>
+  </way>
+  <node id="-123000" user="overview-creator" visible="true" lat="-0.00150" lon="0.00180">
     <tag k="aerialway" v="station"/>
     <tag k="name" v="station"/>
-  </way>
-  <node id="-123000" user="overview-creator" visible="true" lat="-0.00150" lon="0.00180">
-    <tag k="aerialway" v="gondola"/>
-    <tag k="name" v="gondola"/>
   </node>
   <node id="-123001" user="overview-creator" visible="true" lat="-0.00146" lon="0.00176"/>
@@ -2629,6 +2680,6 @@
     <nd ref="-123004"/>
     <nd ref="-123001"/>
-    <tag k="aerialway" v="gondola"/>
-    <tag k="name" v="gondola"/>
+    <tag k="aerialway" v="station"/>
+    <tag k="name" v="station"/>
   </way>
   <node id="-123400" user="overview-creator" visible="true" lat="-0.00170" lon="0.00180">
@@ -2688,6 +2739,6 @@
   </way>
   <node id="-124200" user="overview-creator" visible="true" lat="-0.00210" lon="0.00180">
-    <tag k="piste:difficulty" v="freeride"/>
-    <tag k="name" v="freeride"/>
+    <tag k="piste:difficulty" v="expert"/>
+    <tag k="name" v="expert"/>
   </node>
   <node id="-124201" user="overview-creator" visible="true" lat="-0.00206" lon="0.00176"/>
@@ -2701,10 +2752,10 @@
     <nd ref="-124204"/>
     <nd ref="-124201"/>
+    <tag k="piste:difficulty" v="expert"/>
+    <tag k="name" v="expert"/>
+  </way>
+  <node id="-124400" user="overview-creator" visible="true" lat="-0.00220" lon="0.00180">
     <tag k="piste:difficulty" v="freeride"/>
     <tag k="name" v="freeride"/>
-  </way>
-  <node id="-124400" user="overview-creator" visible="true" lat="-0.00220" lon="0.00180">
-    <tag k="piste:difficulty" v="novice"/>
-    <tag k="name" v="novice"/>
   </node>
   <node id="-124401" user="overview-creator" visible="true" lat="-0.00216" lon="0.00176"/>
@@ -2718,4 +2769,21 @@
     <nd ref="-124404"/>
     <nd ref="-124401"/>
+    <tag k="piste:difficulty" v="freeride"/>
+    <tag k="name" v="freeride"/>
+  </way>
+  <node id="-124600" user="overview-creator" visible="true" lat="-0.00230" lon="0.00180">
+    <tag k="piste:difficulty" v="novice"/>
+    <tag k="name" v="novice"/>
+  </node>
+  <node id="-124601" user="overview-creator" visible="true" lat="-0.00226" lon="0.00176"/>
+  <node id="-124602" user="overview-creator" visible="true" lat="-0.00226" lon="0.00204"/>
+  <node id="-124603" user="overview-creator" visible="true" lat="-0.00234" lon="0.00204"/>
+  <node id="-124604" user="overview-creator" visible="true" lat="-0.00234" lon="0.00176"/>
+  <way id="-124604" user="overview-creator" visible="true">
+    <nd ref="-124601"/>
+    <nd ref="-124602"/>
+    <nd ref="-124603"/>
+    <nd ref="-124604"/>
+    <nd ref="-124601"/>
     <tag k="piste:difficulty" v="novice"/>
     <tag k="name" v="novice"/>
@@ -3019,6 +3087,6 @@
   </way>
   <node id="-160600" user="overview-creator" visible="true" lat="-0.00030" lon="0.00240">
-    <tag k="amenity" v="biergarten"/>
-    <tag k="name" v="biergarten"/>
+    <tag k="amenity" v="baby_hatch"/>
+    <tag k="name" v="baby_hatch"/>
   </node>
   <node id="-160601" user="overview-creator" visible="true" lat="-0.00026" lon="0.00236"/>
@@ -3032,10 +3100,10 @@
     <nd ref="-160604"/>
     <nd ref="-160601"/>
+    <tag k="amenity" v="baby_hatch"/>
+    <tag k="name" v="baby_hatch"/>
+  </way>
+  <node id="-160800" user="overview-creator" visible="true" lat="-0.00040" lon="0.00240">
     <tag k="amenity" v="biergarten"/>
     <tag k="name" v="biergarten"/>
-  </way>
-  <node id="-160800" user="overview-creator" visible="true" lat="-0.00040" lon="0.00240">
-    <tag k="amenity" v="nightclub"/>
-    <tag k="name" v="nightclub"/>
   </node>
   <node id="-160801" user="overview-creator" visible="true" lat="-0.00036" lon="0.00236"/>
@@ -3049,10 +3117,10 @@
     <nd ref="-160804"/>
     <nd ref="-160801"/>
+    <tag k="amenity" v="biergarten"/>
+    <tag k="name" v="biergarten"/>
+  </way>
+  <node id="-161000" user="overview-creator" visible="true" lat="-0.00050" lon="0.00240">
     <tag k="amenity" v="nightclub"/>
     <tag k="name" v="nightclub"/>
-  </way>
-  <node id="-161000" user="overview-creator" visible="true" lat="-0.00050" lon="0.00240">
-    <tag k="amenity" v="cafe"/>
-    <tag k="name" v="cafe"/>
   </node>
   <node id="-161001" user="overview-creator" visible="true" lat="-0.00046" lon="0.00236"/>
@@ -3066,10 +3134,10 @@
     <nd ref="-161004"/>
     <nd ref="-161001"/>
+    <tag k="amenity" v="nightclub"/>
+    <tag k="name" v="nightclub"/>
+  </way>
+  <node id="-161200" user="overview-creator" visible="true" lat="-0.00060" lon="0.00240">
     <tag k="amenity" v="cafe"/>
     <tag k="name" v="cafe"/>
-  </way>
-  <node id="-161200" user="overview-creator" visible="true" lat="-0.00060" lon="0.00240">
-    <tag k="amenity" v="restaurant"/>
-    <tag k="name" v="restaurant"/>
   </node>
   <node id="-161201" user="overview-creator" visible="true" lat="-0.00056" lon="0.00236"/>
@@ -3083,10 +3151,10 @@
     <nd ref="-161204"/>
     <nd ref="-161201"/>
+    <tag k="amenity" v="cafe"/>
+    <tag k="name" v="cafe"/>
+  </way>
+  <node id="-161400" user="overview-creator" visible="true" lat="-0.00070" lon="0.00240">
     <tag k="amenity" v="restaurant"/>
     <tag k="name" v="restaurant"/>
-  </way>
-  <node id="-161400" user="overview-creator" visible="true" lat="-0.00070" lon="0.00240">
-    <tag k="amenity" v="fast_food"/>
-    <tag k="name" v="fast_food"/>
   </node>
   <node id="-161401" user="overview-creator" visible="true" lat="-0.00066" lon="0.00236"/>
@@ -3100,10 +3168,10 @@
     <nd ref="-161404"/>
     <nd ref="-161401"/>
+    <tag k="amenity" v="restaurant"/>
+    <tag k="name" v="restaurant"/>
+  </way>
+  <node id="-161600" user="overview-creator" visible="true" lat="-0.00080" lon="0.00240">
     <tag k="amenity" v="fast_food"/>
     <tag k="name" v="fast_food"/>
-  </way>
-  <node id="-161600" user="overview-creator" visible="true" lat="-0.00080" lon="0.00240">
-    <tag k="amenity" v="bar"/>
-    <tag k="name" v="bar"/>
   </node>
   <node id="-161601" user="overview-creator" visible="true" lat="-0.00076" lon="0.00236"/>
@@ -3117,10 +3185,10 @@
     <nd ref="-161604"/>
     <nd ref="-161601"/>
+    <tag k="amenity" v="fast_food"/>
+    <tag k="name" v="fast_food"/>
+  </way>
+  <node id="-161800" user="overview-creator" visible="true" lat="-0.00090" lon="0.00240">
     <tag k="amenity" v="bar"/>
     <tag k="name" v="bar"/>
-  </way>
-  <node id="-161800" user="overview-creator" visible="true" lat="-0.00090" lon="0.00240">
-    <tag k="amenity" v="ice_cream"/>
-    <tag k="name" v="ice_cream"/>
   </node>
   <node id="-161801" user="overview-creator" visible="true" lat="-0.00086" lon="0.00236"/>
@@ -3134,10 +3202,10 @@
     <nd ref="-161804"/>
     <nd ref="-161801"/>
+    <tag k="amenity" v="bar"/>
+    <tag k="name" v="bar"/>
+  </way>
+  <node id="-162000" user="overview-creator" visible="true" lat="-0.00100" lon="0.00240">
     <tag k="amenity" v="ice_cream"/>
     <tag k="name" v="ice_cream"/>
-  </way>
-  <node id="-162000" user="overview-creator" visible="true" lat="-0.00100" lon="0.00240">
-    <tag k="amenity" v="parking"/>
-    <tag k="name" v="parking"/>
   </node>
   <node id="-162001" user="overview-creator" visible="true" lat="-0.00096" lon="0.00236"/>
@@ -3151,10 +3219,10 @@
     <nd ref="-162004"/>
     <nd ref="-162001"/>
+    <tag k="amenity" v="ice_cream"/>
+    <tag k="name" v="ice_cream"/>
+  </way>
+  <node id="-162200" user="overview-creator" visible="true" lat="-0.00110" lon="0.00240">
     <tag k="amenity" v="parking"/>
     <tag k="name" v="parking"/>
-  </way>
-  <node id="-162200" user="overview-creator" visible="true" lat="-0.00110" lon="0.00240">
-    <tag k="amenity" v="bicycle_parking"/>
-    <tag k="name" v="bicycle_parking"/>
   </node>
   <node id="-162201" user="overview-creator" visible="true" lat="-0.00106" lon="0.00236"/>
@@ -3168,10 +3236,10 @@
     <nd ref="-162204"/>
     <nd ref="-162201"/>
+    <tag k="amenity" v="parking"/>
+    <tag k="name" v="parking"/>
+  </way>
+  <node id="-162400" user="overview-creator" visible="true" lat="-0.00120" lon="0.00240">
     <tag k="amenity" v="bicycle_parking"/>
     <tag k="name" v="bicycle_parking"/>
-  </way>
-  <node id="-162400" user="overview-creator" visible="true" lat="-0.00120" lon="0.00240">
-    <tag k="amenity" v="bicycle_rental"/>
-    <tag k="name" v="bicycle_rental"/>
   </node>
   <node id="-162401" user="overview-creator" visible="true" lat="-0.00116" lon="0.00236"/>
@@ -3185,10 +3253,10 @@
     <nd ref="-162404"/>
     <nd ref="-162401"/>
+    <tag k="amenity" v="bicycle_parking"/>
+    <tag k="name" v="bicycle_parking"/>
+  </way>
+  <node id="-162600" user="overview-creator" visible="true" lat="-0.00130" lon="0.00240">
     <tag k="amenity" v="bicycle_rental"/>
     <tag k="name" v="bicycle_rental"/>
-  </way>
-  <node id="-162600" user="overview-creator" visible="true" lat="-0.00130" lon="0.00240">
-    <tag k="amenity" v="car_rental"/>
-    <tag k="name" v="car_rental"/>
   </node>
   <node id="-162601" user="overview-creator" visible="true" lat="-0.00126" lon="0.00236"/>
@@ -3202,10 +3270,10 @@
     <nd ref="-162604"/>
     <nd ref="-162601"/>
+    <tag k="amenity" v="bicycle_rental"/>
+    <tag k="name" v="bicycle_rental"/>
+  </way>
+  <node id="-162800" user="overview-creator" visible="true" lat="-0.00140" lon="0.00240">
     <tag k="amenity" v="car_rental"/>
     <tag k="name" v="car_rental"/>
-  </way>
-  <node id="-162800" user="overview-creator" visible="true" lat="-0.00140" lon="0.00240">
-    <tag k="amenity" v="car_sharing"/>
-    <tag k="name" v="car_sharing"/>
   </node>
   <node id="-162801" user="overview-creator" visible="true" lat="-0.00136" lon="0.00236"/>
@@ -3219,10 +3287,10 @@
     <nd ref="-162804"/>
     <nd ref="-162801"/>
+    <tag k="amenity" v="car_rental"/>
+    <tag k="name" v="car_rental"/>
+  </way>
+  <node id="-163000" user="overview-creator" visible="true" lat="-0.00150" lon="0.00240">
     <tag k="amenity" v="car_sharing"/>
     <tag k="name" v="car_sharing"/>
-  </way>
-  <node id="-163000" user="overview-creator" visible="true" lat="-0.00150" lon="0.00240">
-    <tag k="amenity" v="car_wash"/>
-    <tag k="name" v="car_wash"/>
   </node>
   <node id="-163001" user="overview-creator" visible="true" lat="-0.00146" lon="0.00236"/>
@@ -3236,10 +3304,10 @@
     <nd ref="-163004"/>
     <nd ref="-163001"/>
+    <tag k="amenity" v="car_sharing"/>
+    <tag k="name" v="car_sharing"/>
+  </way>
+  <node id="-163200" user="overview-creator" visible="true" lat="-0.00160" lon="0.00240">
     <tag k="amenity" v="car_wash"/>
     <tag k="name" v="car_wash"/>
-  </way>
-  <node id="-163200" user="overview-creator" visible="true" lat="-0.00160" lon="0.00240">
-    <tag k="amenity" v="taxi"/>
-    <tag k="name" v="taxi"/>
   </node>
   <node id="-163201" user="overview-creator" visible="true" lat="-0.00156" lon="0.00236"/>
@@ -3253,10 +3321,10 @@
     <nd ref="-163204"/>
     <nd ref="-163201"/>
+    <tag k="amenity" v="car_wash"/>
+    <tag k="name" v="car_wash"/>
+  </way>
+  <node id="-163400" user="overview-creator" visible="true" lat="-0.00170" lon="0.00240">
     <tag k="amenity" v="taxi"/>
     <tag k="name" v="taxi"/>
-  </way>
-  <node id="-163400" user="overview-creator" visible="true" lat="-0.00170" lon="0.00240">
-    <tag k="amenity" v="fuel"/>
-    <tag k="name" v="fuel"/>
   </node>
   <node id="-163401" user="overview-creator" visible="true" lat="-0.00166" lon="0.00236"/>
@@ -3270,10 +3338,10 @@
     <nd ref="-163404"/>
     <nd ref="-163401"/>
+    <tag k="amenity" v="taxi"/>
+    <tag k="name" v="taxi"/>
+  </way>
+  <node id="-163600" user="overview-creator" visible="true" lat="-0.00180" lon="0.00240">
     <tag k="amenity" v="fuel"/>
     <tag k="name" v="fuel"/>
-  </way>
-  <node id="-163600" user="overview-creator" visible="true" lat="-0.00180" lon="0.00240">
-    <tag k="amenity" v="telephone"/>
-    <tag k="name" v="telephone"/>
   </node>
   <node id="-163601" user="overview-creator" visible="true" lat="-0.00176" lon="0.00236"/>
@@ -3287,10 +3355,10 @@
     <nd ref="-163604"/>
     <nd ref="-163601"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="name" v="fuel"/>
+  </way>
+  <node id="-163800" user="overview-creator" visible="true" lat="-0.00190" lon="0.00240">
     <tag k="amenity" v="telephone"/>
     <tag k="name" v="telephone"/>
-  </way>
-  <node id="-163800" user="overview-creator" visible="true" lat="-0.00190" lon="0.00240">
-    <tag k="amenity" v="emergency_phone"/>
-    <tag k="name" v="emergency_phone"/>
   </node>
   <node id="-163801" user="overview-creator" visible="true" lat="-0.00186" lon="0.00236"/>
@@ -3304,10 +3372,10 @@
     <nd ref="-163804"/>
     <nd ref="-163801"/>
+    <tag k="amenity" v="telephone"/>
+    <tag k="name" v="telephone"/>
+  </way>
+  <node id="-164000" user="overview-creator" visible="true" lat="-0.00200" lon="0.00240">
     <tag k="amenity" v="emergency_phone"/>
     <tag k="name" v="emergency_phone"/>
-  </way>
-  <node id="-164000" user="overview-creator" visible="true" lat="-0.00200" lon="0.00240">
-    <tag k="amenity" v="toilets"/>
-    <tag k="name" v="toilets"/>
   </node>
   <node id="-164001" user="overview-creator" visible="true" lat="-0.00196" lon="0.00236"/>
@@ -3321,10 +3389,10 @@
     <nd ref="-164004"/>
     <nd ref="-164001"/>
+    <tag k="amenity" v="emergency_phone"/>
+    <tag k="name" v="emergency_phone"/>
+  </way>
+  <node id="-164200" user="overview-creator" visible="true" lat="-0.00210" lon="0.00240">
     <tag k="amenity" v="toilets"/>
     <tag k="name" v="toilets"/>
-  </way>
-  <node id="-164200" user="overview-creator" visible="true" lat="-0.00210" lon="0.00240">
-    <tag k="amenity" v="recycling"/>
-    <tag k="name" v="recycling"/>
   </node>
   <node id="-164201" user="overview-creator" visible="true" lat="-0.00206" lon="0.00236"/>
@@ -3338,10 +3406,10 @@
     <nd ref="-164204"/>
     <nd ref="-164201"/>
+    <tag k="amenity" v="toilets"/>
+    <tag k="name" v="toilets"/>
+  </way>
+  <node id="-164400" user="overview-creator" visible="true" lat="-0.00220" lon="0.00240">
     <tag k="amenity" v="recycling"/>
     <tag k="name" v="recycling"/>
-  </way>
-  <node id="-164400" user="overview-creator" visible="true" lat="-0.00220" lon="0.00240">
-    <tag k="amenity" v="public_building"/>
-    <tag k="name" v="public_building"/>
   </node>
   <node id="-164401" user="overview-creator" visible="true" lat="-0.00216" lon="0.00236"/>
@@ -3355,10 +3423,10 @@
     <nd ref="-164404"/>
     <nd ref="-164401"/>
+    <tag k="amenity" v="recycling"/>
+    <tag k="name" v="recycling"/>
+  </way>
+  <node id="-164600" user="overview-creator" visible="true" lat="-0.00230" lon="0.00240">
     <tag k="amenity" v="public_building"/>
     <tag k="name" v="public_building"/>
-  </way>
-  <node id="-164600" user="overview-creator" visible="true" lat="-0.00230" lon="0.00240">
-    <tag k="amenity" v="embassy"/>
-    <tag k="name" v="embassy"/>
   </node>
   <node id="-164601" user="overview-creator" visible="true" lat="-0.00226" lon="0.00236"/>
@@ -3372,10 +3440,10 @@
     <nd ref="-164604"/>
     <nd ref="-164601"/>
+    <tag k="amenity" v="public_building"/>
+    <tag k="name" v="public_building"/>
+  </way>
+  <node id="-164800" user="overview-creator" visible="true" lat="-0.00240" lon="0.00240">
     <tag k="amenity" v="embassy"/>
     <tag k="name" v="embassy"/>
-  </way>
-  <node id="-164800" user="overview-creator" visible="true" lat="-0.00240" lon="0.00240">
-    <tag k="amenity" v="townhall"/>
-    <tag k="name" v="townhall"/>
   </node>
   <node id="-164801" user="overview-creator" visible="true" lat="-0.00236" lon="0.00236"/>
@@ -3389,10 +3457,10 @@
     <nd ref="-164804"/>
     <nd ref="-164801"/>
+    <tag k="amenity" v="embassy"/>
+    <tag k="name" v="embassy"/>
+  </way>
+  <node id="-165000" user="overview-creator" visible="true" lat="-0.00250" lon="0.00240">
     <tag k="amenity" v="townhall"/>
     <tag k="name" v="townhall"/>
-  </way>
-  <node id="-165000" user="overview-creator" visible="true" lat="-0.00250" lon="0.00240">
-    <tag k="amenity" v="community_centre"/>
-    <tag k="name" v="community_centre"/>
   </node>
   <node id="-165001" user="overview-creator" visible="true" lat="-0.00246" lon="0.00236"/>
@@ -3406,10 +3474,10 @@
     <nd ref="-165004"/>
     <nd ref="-165001"/>
+    <tag k="amenity" v="townhall"/>
+    <tag k="name" v="townhall"/>
+  </way>
+  <node id="-165200" user="overview-creator" visible="true" lat="-0.00260" lon="0.00240">
     <tag k="amenity" v="community_centre"/>
     <tag k="name" v="community_centre"/>
-  </way>
-  <node id="-165200" user="overview-creator" visible="true" lat="-0.00260" lon="0.00240">
-    <tag k="amenity" v="drinking_water"/>
-    <tag k="name" v="drinking_water"/>
   </node>
   <node id="-165201" user="overview-creator" visible="true" lat="-0.00256" lon="0.00236"/>
@@ -3423,10 +3491,10 @@
     <nd ref="-165204"/>
     <nd ref="-165201"/>
+    <tag k="amenity" v="community_centre"/>
+    <tag k="name" v="community_centre"/>
+  </way>
+  <node id="-165400" user="overview-creator" visible="true" lat="-0.00270" lon="0.00240">
     <tag k="amenity" v="drinking_water"/>
     <tag k="name" v="drinking_water"/>
-  </way>
-  <node id="-165400" user="overview-creator" visible="true" lat="-0.00270" lon="0.00240">
-    <tag k="amenity" v="fountain"/>
-    <tag k="name" v="fountain"/>
   </node>
   <node id="-165401" user="overview-creator" visible="true" lat="-0.00266" lon="0.00236"/>
@@ -3440,10 +3508,10 @@
     <nd ref="-165404"/>
     <nd ref="-165401"/>
+    <tag k="amenity" v="drinking_water"/>
+    <tag k="name" v="drinking_water"/>
+  </way>
+  <node id="-165600" user="overview-creator" visible="true" lat="-0.00280" lon="0.00240">
     <tag k="amenity" v="fountain"/>
     <tag k="name" v="fountain"/>
-  </way>
-  <node id="-165600" user="overview-creator" visible="true" lat="-0.00280" lon="0.00240">
-    <tag k="amenity" v="place_of_worship"/>
-    <tag k="name" v="place_of_worship"/>
   </node>
   <node id="-165601" user="overview-creator" visible="true" lat="-0.00276" lon="0.00236"/>
@@ -3457,10 +3525,10 @@
     <nd ref="-165604"/>
     <nd ref="-165601"/>
+    <tag k="amenity" v="fountain"/>
+    <tag k="name" v="fountain"/>
+  </way>
+  <node id="-165800" user="overview-creator" visible="true" lat="-0.00290" lon="0.00240">
     <tag k="amenity" v="place_of_worship"/>
     <tag k="name" v="place_of_worship"/>
-  </way>
-  <node id="-165800" user="overview-creator" visible="true" lat="-0.00290" lon="0.00240">
-    <tag k="amenity" v="grave_yard"/>
-    <tag k="name" v="grave_yard"/>
   </node>
   <node id="-165801" user="overview-creator" visible="true" lat="-0.00286" lon="0.00236"/>
@@ -3474,10 +3542,10 @@
     <nd ref="-165804"/>
     <nd ref="-165801"/>
+    <tag k="amenity" v="place_of_worship"/>
+    <tag k="name" v="place_of_worship"/>
+  </way>
+  <node id="-166000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00240">
     <tag k="amenity" v="grave_yard"/>
     <tag k="name" v="grave_yard"/>
-  </way>
-  <node id="-166000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00240">
-    <tag k="amenity" v="crematorium"/>
-    <tag k="name" v="crematorium"/>
   </node>
   <node id="-166001" user="overview-creator" visible="true" lat="-0.00296" lon="0.00236"/>
@@ -3491,10 +3559,10 @@
     <nd ref="-166004"/>
     <nd ref="-166001"/>
+    <tag k="amenity" v="grave_yard"/>
+    <tag k="name" v="grave_yard"/>
+  </way>
+  <node id="-166200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00240">
     <tag k="amenity" v="crematorium"/>
     <tag k="name" v="crematorium"/>
-  </way>
-  <node id="-166200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00240">
-    <tag k="amenity" v="post_office"/>
-    <tag k="name" v="post_office"/>
   </node>
   <node id="-166201" user="overview-creator" visible="true" lat="-0.00306" lon="0.00236"/>
@@ -3508,10 +3576,10 @@
     <nd ref="-166204"/>
     <nd ref="-166201"/>
+    <tag k="amenity" v="crematorium"/>
+    <tag k="name" v="crematorium"/>
+  </way>
+  <node id="-166400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00240">
     <tag k="amenity" v="post_office"/>
     <tag k="name" v="post_office"/>
-  </way>
-  <node id="-166400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00240">
-    <tag k="amenity" v="post_box"/>
-    <tag k="name" v="post_box"/>
   </node>
   <node id="-166401" user="overview-creator" visible="true" lat="-0.00316" lon="0.00236"/>
@@ -3525,10 +3593,10 @@
     <nd ref="-166404"/>
     <nd ref="-166401"/>
+    <tag k="amenity" v="post_office"/>
+    <tag k="name" v="post_office"/>
+  </way>
+  <node id="-166600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00240">
     <tag k="amenity" v="post_box"/>
     <tag k="name" v="post_box"/>
-  </way>
-  <node id="-166600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00240">
-    <tag k="amenity" v="school"/>
-    <tag k="name" v="school"/>
   </node>
   <node id="-166601" user="overview-creator" visible="true" lat="-0.00326" lon="0.00236"/>
@@ -3542,10 +3610,10 @@
     <nd ref="-166604"/>
     <nd ref="-166601"/>
+    <tag k="amenity" v="post_box"/>
+    <tag k="name" v="post_box"/>
+  </way>
+  <node id="-166800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00240">
     <tag k="amenity" v="school"/>
     <tag k="name" v="school"/>
-  </way>
-  <node id="-166800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00240">
-    <tag k="amenity" v="university"/>
-    <tag k="name" v="university"/>
   </node>
   <node id="-166801" user="overview-creator" visible="true" lat="-0.00336" lon="0.00236"/>
@@ -3559,10 +3627,10 @@
     <nd ref="-166804"/>
     <nd ref="-166801"/>
+    <tag k="amenity" v="school"/>
+    <tag k="name" v="school"/>
+  </way>
+  <node id="-167000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00240">
     <tag k="amenity" v="university"/>
     <tag k="name" v="university"/>
-  </way>
-  <node id="-167000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00240">
-    <tag k="amenity" v="college"/>
-    <tag k="name" v="college"/>
   </node>
   <node id="-167001" user="overview-creator" visible="true" lat="-0.00346" lon="0.00236"/>
@@ -3576,10 +3644,10 @@
     <nd ref="-167004"/>
     <nd ref="-167001"/>
+    <tag k="amenity" v="university"/>
+    <tag k="name" v="university"/>
+  </way>
+  <node id="-167200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00240">
     <tag k="amenity" v="college"/>
     <tag k="name" v="college"/>
-  </way>
-  <node id="-167200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00240">
-    <tag k="amenity" v="kindergarten"/>
-    <tag k="name" v="kindergarten"/>
   </node>
   <node id="-167201" user="overview-creator" visible="true" lat="-0.00356" lon="0.00236"/>
@@ -3593,10 +3661,10 @@
     <nd ref="-167204"/>
     <nd ref="-167201"/>
+    <tag k="amenity" v="college"/>
+    <tag k="name" v="college"/>
+  </way>
+  <node id="-167400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00240">
     <tag k="amenity" v="kindergarten"/>
     <tag k="name" v="kindergarten"/>
-  </way>
-  <node id="-167400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00240">
-    <tag k="amenity" v="driving_school"/>
-    <tag k="name" v="driving_school"/>
   </node>
   <node id="-167401" user="overview-creator" visible="true" lat="-0.00366" lon="0.00236"/>
@@ -3610,10 +3678,10 @@
     <nd ref="-167404"/>
     <nd ref="-167401"/>
+    <tag k="amenity" v="kindergarten"/>
+    <tag k="name" v="kindergarten"/>
+  </way>
+  <node id="-167600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00240">
     <tag k="amenity" v="driving_school"/>
     <tag k="name" v="driving_school"/>
-  </way>
-  <node id="-167600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00240">
-    <tag k="amenity" v="pharmacy"/>
-    <tag k="name" v="pharmacy"/>
   </node>
   <node id="-167601" user="overview-creator" visible="true" lat="-0.00376" lon="0.00236"/>
@@ -3627,10 +3695,10 @@
     <nd ref="-167604"/>
     <nd ref="-167601"/>
+    <tag k="amenity" v="driving_school"/>
+    <tag k="name" v="driving_school"/>
+  </way>
+  <node id="-167800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00240">
     <tag k="amenity" v="pharmacy"/>
     <tag k="name" v="pharmacy"/>
-  </way>
-  <node id="-167800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00240">
-    <tag k="amenity" v="hospital"/>
-    <tag k="name" v="hospital"/>
   </node>
   <node id="-167801" user="overview-creator" visible="true" lat="-0.00386" lon="0.00236"/>
@@ -3644,10 +3712,10 @@
     <nd ref="-167804"/>
     <nd ref="-167801"/>
+    <tag k="amenity" v="pharmacy"/>
+    <tag k="name" v="pharmacy"/>
+  </way>
+  <node id="-168000" user="overview-creator" visible="true" lat="-0.00400" lon="0.00240">
     <tag k="amenity" v="hospital"/>
     <tag k="name" v="hospital"/>
-  </way>
-  <node id="-168000" user="overview-creator" visible="true" lat="-0.00400" lon="0.00240">
-    <tag k="amenity" v="nursery"/>
-    <tag k="name" v="nursery"/>
   </node>
   <node id="-168001" user="overview-creator" visible="true" lat="-0.00396" lon="0.00236"/>
@@ -3661,10 +3729,10 @@
     <nd ref="-168004"/>
     <nd ref="-168001"/>
+    <tag k="amenity" v="hospital"/>
+    <tag k="name" v="hospital"/>
+  </way>
+  <node id="-168200" user="overview-creator" visible="true" lat="-0.00410" lon="0.00240">
     <tag k="amenity" v="nursery"/>
     <tag k="name" v="nursery"/>
-  </way>
-  <node id="-168200" user="overview-creator" visible="true" lat="-0.00410" lon="0.00240">
-    <tag k="amenity" v="doctors"/>
-    <tag k="name" v="doctors"/>
   </node>
   <node id="-168201" user="overview-creator" visible="true" lat="-0.00406" lon="0.00236"/>
@@ -3678,10 +3746,10 @@
     <nd ref="-168204"/>
     <nd ref="-168201"/>
+    <tag k="amenity" v="nursery"/>
+    <tag k="name" v="nursery"/>
+  </way>
+  <node id="-186000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00270">
     <tag k="amenity" v="doctors"/>
     <tag k="name" v="doctors"/>
-  </way>
-  <node id="-186000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00270">
-    <tag k="amenity" v="dentist"/>
-    <tag k="name" v="dentist"/>
   </node>
   <node id="-186001" user="overview-creator" visible="true" lat="-0.00296" lon="0.00266"/>
@@ -3695,10 +3763,10 @@
     <nd ref="-186004"/>
     <nd ref="-186001"/>
+    <tag k="amenity" v="doctors"/>
+    <tag k="name" v="doctors"/>
+  </way>
+  <node id="-186200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00270">
     <tag k="amenity" v="dentist"/>
     <tag k="name" v="dentist"/>
-  </way>
-  <node id="-186200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00270">
-    <tag k="amenity" v="veterinary"/>
-    <tag k="name" v="veterinary"/>
   </node>
   <node id="-186201" user="overview-creator" visible="true" lat="-0.00306" lon="0.00266"/>
@@ -3712,10 +3780,10 @@
     <nd ref="-186204"/>
     <nd ref="-186201"/>
+    <tag k="amenity" v="dentist"/>
+    <tag k="name" v="dentist"/>
+  </way>
+  <node id="-186400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00270">
     <tag k="amenity" v="veterinary"/>
     <tag k="name" v="veterinary"/>
-  </way>
-  <node id="-186400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00270">
-    <tag k="amenity" v="library"/>
-    <tag k="name" v="library"/>
   </node>
   <node id="-186401" user="overview-creator" visible="true" lat="-0.00316" lon="0.00266"/>
@@ -3729,10 +3797,10 @@
     <nd ref="-186404"/>
     <nd ref="-186401"/>
+    <tag k="amenity" v="veterinary"/>
+    <tag k="name" v="veterinary"/>
+  </way>
+  <node id="-186600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00270">
     <tag k="amenity" v="library"/>
     <tag k="name" v="library"/>
-  </way>
-  <node id="-186600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00270">
-    <tag k="amenity" v="police"/>
-    <tag k="name" v="police"/>
   </node>
   <node id="-186601" user="overview-creator" visible="true" lat="-0.00326" lon="0.00266"/>
@@ -3746,10 +3814,10 @@
     <nd ref="-186604"/>
     <nd ref="-186601"/>
+    <tag k="amenity" v="library"/>
+    <tag k="name" v="library"/>
+  </way>
+  <node id="-186800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00270">
     <tag k="amenity" v="police"/>
     <tag k="name" v="police"/>
-  </way>
-  <node id="-186800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00270">
-    <tag k="amenity" v="fire_station"/>
-    <tag k="name" v="fire_station"/>
   </node>
   <node id="-186801" user="overview-creator" visible="true" lat="-0.00336" lon="0.00266"/>
@@ -3763,10 +3831,10 @@
     <nd ref="-186804"/>
     <nd ref="-186801"/>
+    <tag k="amenity" v="police"/>
+    <tag k="name" v="police"/>
+  </way>
+  <node id="-187000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00270">
     <tag k="amenity" v="fire_station"/>
     <tag k="name" v="fire_station"/>
-  </way>
-  <node id="-187000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00270">
-    <tag k="amenity" v="bus_station"/>
-    <tag k="name" v="bus_station"/>
   </node>
   <node id="-187001" user="overview-creator" visible="true" lat="-0.00346" lon="0.00266"/>
@@ -3780,10 +3848,10 @@
     <nd ref="-187004"/>
     <nd ref="-187001"/>
+    <tag k="amenity" v="fire_station"/>
+    <tag k="name" v="fire_station"/>
+  </way>
+  <node id="-187200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00270">
     <tag k="amenity" v="bus_station"/>
     <tag k="name" v="bus_station"/>
-  </way>
-  <node id="-187200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00270">
-    <tag k="amenity" v="ferry_terminal"/>
-    <tag k="name" v="ferry_terminal"/>
   </node>
   <node id="-187201" user="overview-creator" visible="true" lat="-0.00356" lon="0.00266"/>
@@ -3797,10 +3865,10 @@
     <nd ref="-187204"/>
     <nd ref="-187201"/>
+    <tag k="amenity" v="bus_station"/>
+    <tag k="name" v="bus_station"/>
+  </way>
+  <node id="-187400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00270">
     <tag k="amenity" v="ferry_terminal"/>
     <tag k="name" v="ferry_terminal"/>
-  </way>
-  <node id="-187400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00270">
-    <tag k="amenity" v="theatre"/>
-    <tag k="name" v="theatre"/>
   </node>
   <node id="-187401" user="overview-creator" visible="true" lat="-0.00366" lon="0.00266"/>
@@ -3814,10 +3882,10 @@
     <nd ref="-187404"/>
     <nd ref="-187401"/>
+    <tag k="amenity" v="ferry_terminal"/>
+    <tag k="name" v="ferry_terminal"/>
+  </way>
+  <node id="-187600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00270">
     <tag k="amenity" v="theatre"/>
     <tag k="name" v="theatre"/>
-  </way>
-  <node id="-187600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00270">
-    <tag k="amenity" v="cinema"/>
-    <tag k="name" v="cinema"/>
   </node>
   <node id="-187601" user="overview-creator" visible="true" lat="-0.00376" lon="0.00266"/>
@@ -3831,10 +3899,10 @@
     <nd ref="-187604"/>
     <nd ref="-187601"/>
+    <tag k="amenity" v="theatre"/>
+    <tag k="name" v="theatre"/>
+  </way>
+  <node id="-187800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00270">
     <tag k="amenity" v="cinema"/>
     <tag k="name" v="cinema"/>
-  </way>
-  <node id="-187800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00270">
-    <tag k="amenity" v="arts_centre"/>
-    <tag k="name" v="arts_centre"/>
   </node>
   <node id="-187801" user="overview-creator" visible="true" lat="-0.00386" lon="0.00266"/>
@@ -3848,10 +3916,10 @@
     <nd ref="-187804"/>
     <nd ref="-187801"/>
+    <tag k="amenity" v="cinema"/>
+    <tag k="name" v="cinema"/>
+  </way>
+  <node id="-188000" user="overview-creator" visible="true" lat="-0.00400" lon="0.00270">
     <tag k="amenity" v="arts_centre"/>
     <tag k="name" v="arts_centre"/>
-  </way>
-  <node id="-188000" user="overview-creator" visible="true" lat="-0.00400" lon="0.00270">
-    <tag k="amenity" v="courthouse"/>
-    <tag k="name" v="courthouse"/>
   </node>
   <node id="-188001" user="overview-creator" visible="true" lat="-0.00396" lon="0.00266"/>
@@ -3865,10 +3933,10 @@
     <nd ref="-188004"/>
     <nd ref="-188001"/>
+    <tag k="amenity" v="arts_centre"/>
+    <tag k="name" v="arts_centre"/>
+  </way>
+  <node id="-188200" user="overview-creator" visible="true" lat="-0.00410" lon="0.00270">
     <tag k="amenity" v="courthouse"/>
     <tag k="name" v="courthouse"/>
-  </way>
-  <node id="-188200" user="overview-creator" visible="true" lat="-0.00410" lon="0.00270">
-    <tag k="amenity" v="prison"/>
-    <tag k="name" v="prison"/>
   </node>
   <node id="-188201" user="overview-creator" visible="true" lat="-0.00406" lon="0.00266"/>
@@ -3882,10 +3950,10 @@
     <nd ref="-188204"/>
     <nd ref="-188201"/>
+    <tag k="amenity" v="courthouse"/>
+    <tag k="name" v="courthouse"/>
+  </way>
+  <node id="-206000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00300">
     <tag k="amenity" v="prison"/>
     <tag k="name" v="prison"/>
-  </way>
-  <node id="-206000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00300">
-    <tag k="amenity" v="bank"/>
-    <tag k="name" v="bank"/>
   </node>
   <node id="-206001" user="overview-creator" visible="true" lat="-0.00296" lon="0.00296"/>
@@ -3899,10 +3967,10 @@
     <nd ref="-206004"/>
     <nd ref="-206001"/>
+    <tag k="amenity" v="prison"/>
+    <tag k="name" v="prison"/>
+  </way>
+  <node id="-206200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00300">
     <tag k="amenity" v="bank"/>
     <tag k="name" v="bank"/>
-  </way>
-  <node id="-206200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00300">
-    <tag k="amenity" v="bureau_de_change"/>
-    <tag k="name" v="bureau_de_change"/>
   </node>
   <node id="-206201" user="overview-creator" visible="true" lat="-0.00306" lon="0.00296"/>
@@ -3916,10 +3984,10 @@
     <nd ref="-206204"/>
     <nd ref="-206201"/>
+    <tag k="amenity" v="bank"/>
+    <tag k="name" v="bank"/>
+  </way>
+  <node id="-206400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00300">
     <tag k="amenity" v="bureau_de_change"/>
     <tag k="name" v="bureau_de_change"/>
-  </way>
-  <node id="-206400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00300">
-    <tag k="amenity" v="atm"/>
-    <tag k="name" v="atm"/>
   </node>
   <node id="-206401" user="overview-creator" visible="true" lat="-0.00316" lon="0.00296"/>
@@ -3933,10 +4001,10 @@
     <nd ref="-206404"/>
     <nd ref="-206401"/>
+    <tag k="amenity" v="bureau_de_change"/>
+    <tag k="name" v="bureau_de_change"/>
+  </way>
+  <node id="-206600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00300">
     <tag k="amenity" v="atm"/>
     <tag k="name" v="atm"/>
-  </way>
-  <node id="-206600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00300">
-    <tag k="amenity" v="bench"/>
-    <tag k="name" v="bench"/>
   </node>
   <node id="-206601" user="overview-creator" visible="true" lat="-0.00326" lon="0.00296"/>
@@ -3950,10 +4018,10 @@
     <nd ref="-206604"/>
     <nd ref="-206601"/>
+    <tag k="amenity" v="atm"/>
+    <tag k="name" v="atm"/>
+  </way>
+  <node id="-206800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00300">
     <tag k="amenity" v="bench"/>
     <tag k="name" v="bench"/>
-  </way>
-  <node id="-206800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00300">
-    <tag k="amenity" v="shelter"/>
-    <tag k="name" v="shelter"/>
   </node>
   <node id="-206801" user="overview-creator" visible="true" lat="-0.00336" lon="0.00296"/>
@@ -3967,10 +4035,10 @@
     <nd ref="-206804"/>
     <nd ref="-206801"/>
+    <tag k="amenity" v="bench"/>
+    <tag k="name" v="bench"/>
+  </way>
+  <node id="-207000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00300">
     <tag k="amenity" v="shelter"/>
     <tag k="name" v="shelter"/>
-  </way>
-  <node id="-207000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00300">
-    <tag k="amenity" v="hunting_stand"/>
-    <tag k="name" v="hunting_stand"/>
   </node>
   <node id="-207001" user="overview-creator" visible="true" lat="-0.00346" lon="0.00296"/>
@@ -3984,10 +4052,10 @@
     <nd ref="-207004"/>
     <nd ref="-207001"/>
+    <tag k="amenity" v="shelter"/>
+    <tag k="name" v="shelter"/>
+  </way>
+  <node id="-207200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00300">
     <tag k="amenity" v="hunting_stand"/>
     <tag k="name" v="hunting_stand"/>
-  </way>
-  <node id="-207200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00300">
-    <tag k="amenity" v="wlan"/>
-    <tag k="name" v="wlan"/>
   </node>
   <node id="-207201" user="overview-creator" visible="true" lat="-0.00356" lon="0.00296"/>
@@ -4001,10 +4069,10 @@
     <nd ref="-207204"/>
     <nd ref="-207201"/>
+    <tag k="amenity" v="hunting_stand"/>
+    <tag k="name" v="hunting_stand"/>
+  </way>
+  <node id="-207400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00300">
     <tag k="amenity" v="wlan"/>
     <tag k="name" v="wlan"/>
-  </way>
-  <node id="-207400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00300">
-    <tag k="amenity" v="vending_machine"/>
-    <tag k="name" v="vending_machine"/>
   </node>
   <node id="-207401" user="overview-creator" visible="true" lat="-0.00366" lon="0.00296"/>
@@ -4018,10 +4086,10 @@
     <nd ref="-207404"/>
     <nd ref="-207401"/>
+    <tag k="amenity" v="wlan"/>
+    <tag k="name" v="wlan"/>
+  </way>
+  <node id="-207600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00300">
     <tag k="amenity" v="vending_machine"/>
     <tag k="name" v="vending_machine"/>
-  </way>
-  <node id="-207600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00300">
-    <tag k="amenity" v="signpost"/>
-    <tag k="name" v="signpost"/>
   </node>
   <node id="-207601" user="overview-creator" visible="true" lat="-0.00376" lon="0.00296"/>
@@ -4035,10 +4103,10 @@
     <nd ref="-207604"/>
     <nd ref="-207601"/>
+    <tag k="amenity" v="vending_machine"/>
+    <tag k="name" v="vending_machine"/>
+  </way>
+  <node id="-207800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00300">
     <tag k="amenity" v="signpost"/>
     <tag k="name" v="signpost"/>
-  </way>
-  <node id="-207800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00300">
-    <tag k="amenity" v="park_bench"/>
-    <tag k="name" v="park_bench"/>
   </node>
   <node id="-207801" user="overview-creator" visible="true" lat="-0.00386" lon="0.00296"/>
@@ -4052,4 +4120,21 @@
     <nd ref="-207804"/>
     <nd ref="-207801"/>
+    <tag k="amenity" v="signpost"/>
+    <tag k="name" v="signpost"/>
+  </way>
+  <node id="-208000" user="overview-creator" visible="true" lat="-0.00400" lon="0.00300">
+    <tag k="amenity" v="park_bench"/>
+    <tag k="name" v="park_bench"/>
+  </node>
+  <node id="-208001" user="overview-creator" visible="true" lat="-0.00396" lon="0.00296"/>
+  <node id="-208002" user="overview-creator" visible="true" lat="-0.00396" lon="0.00324"/>
+  <node id="-208003" user="overview-creator" visible="true" lat="-0.00404" lon="0.00324"/>
+  <node id="-208004" user="overview-creator" visible="true" lat="-0.00404" lon="0.00296"/>
+  <way id="-208004" user="overview-creator" visible="true">
+    <nd ref="-208001"/>
+    <nd ref="-208002"/>
+    <nd ref="-208003"/>
+    <nd ref="-208004"/>
+    <nd ref="-208001"/>
     <tag k="amenity" v="park_bench"/>
     <tag k="name" v="park_bench"/>
@@ -4403,4 +4488,21 @@
     <tag k="name" v="park_and_ride"/>
   </way>
+  <node id="-185200" user="overview-creator" visible="true" lat="-0.00260" lon="0.00270">
+    <tag k="parking" v="surface"/>
+    <tag k="name" v="surface"/>
+  </node>
+  <node id="-185201" user="overview-creator" visible="true" lat="-0.00256" lon="0.00266"/>
+  <node id="-185202" user="overview-creator" visible="true" lat="-0.00256" lon="0.00294"/>
+  <node id="-185203" user="overview-creator" visible="true" lat="-0.00264" lon="0.00294"/>
+  <node id="-185204" user="overview-creator" visible="true" lat="-0.00264" lon="0.00266"/>
+  <way id="-185204" user="overview-creator" visible="true">
+    <nd ref="-185201"/>
+    <nd ref="-185202"/>
+    <nd ref="-185203"/>
+    <nd ref="-185204"/>
+    <nd ref="-185201"/>
+    <tag k="parking" v="surface"/>
+    <tag k="name" v="surface"/>
+  </way>
   <node id="-200200" user="overview-creator" visible="true" lat="-0.00010" lon="0.00300">
     <tag k="tourism" v="information"/>
@@ -4561,6 +4663,6 @@
   </way>
   <node id="-202200" user="overview-creator" visible="true" lat="-0.00110" lon="0.00300">
-    <tag k="religion" v="taoist"/>
-    <tag k="name" v="taoist"/>
+    <tag k="religion" v="spiritualist"/>
+    <tag k="name" v="spiritualist"/>
   </node>
   <node id="-202201" user="overview-creator" visible="true" lat="-0.00106" lon="0.00296"/>
@@ -4574,6 +4676,57 @@
     <nd ref="-202204"/>
     <nd ref="-202201"/>
+    <tag k="religion" v="spiritualist"/>
+    <tag k="name" v="spiritualist"/>
+  </way>
+  <node id="-202400" user="overview-creator" visible="true" lat="-0.00120" lon="0.00300">
     <tag k="religion" v="taoist"/>
     <tag k="name" v="taoist"/>
+  </node>
+  <node id="-202401" user="overview-creator" visible="true" lat="-0.00116" lon="0.00296"/>
+  <node id="-202402" user="overview-creator" visible="true" lat="-0.00116" lon="0.00324"/>
+  <node id="-202403" user="overview-creator" visible="true" lat="-0.00124" lon="0.00324"/>
+  <node id="-202404" user="overview-creator" visible="true" lat="-0.00124" lon="0.00296"/>
+  <way id="-202404" user="overview-creator" visible="true">
+    <nd ref="-202401"/>
+    <nd ref="-202402"/>
+    <nd ref="-202403"/>
+    <nd ref="-202404"/>
+    <nd ref="-202401"/>
+    <tag k="religion" v="taoist"/>
+    <tag k="name" v="taoist"/>
+  </way>
+  <node id="-202600" user="overview-creator" visible="true" lat="-0.00130" lon="0.00300">
+    <tag k="religion" v="unitarian"/>
+    <tag k="name" v="unitarian"/>
+  </node>
+  <node id="-202601" user="overview-creator" visible="true" lat="-0.00126" lon="0.00296"/>
+  <node id="-202602" user="overview-creator" visible="true" lat="-0.00126" lon="0.00324"/>
+  <node id="-202603" user="overview-creator" visible="true" lat="-0.00134" lon="0.00324"/>
+  <node id="-202604" user="overview-creator" visible="true" lat="-0.00134" lon="0.00296"/>
+  <way id="-202604" user="overview-creator" visible="true">
+    <nd ref="-202601"/>
+    <nd ref="-202602"/>
+    <nd ref="-202603"/>
+    <nd ref="-202604"/>
+    <nd ref="-202601"/>
+    <tag k="religion" v="unitarian"/>
+    <tag k="name" v="unitarian"/>
+  </way>
+  <node id="-202800" user="overview-creator" visible="true" lat="-0.00140" lon="0.00300">
+    <tag k="religion" v="zoroastrian"/>
+    <tag k="name" v="zoroastrian"/>
+  </node>
+  <node id="-202801" user="overview-creator" visible="true" lat="-0.00136" lon="0.00296"/>
+  <node id="-202802" user="overview-creator" visible="true" lat="-0.00136" lon="0.00324"/>
+  <node id="-202803" user="overview-creator" visible="true" lat="-0.00144" lon="0.00324"/>
+  <node id="-202804" user="overview-creator" visible="true" lat="-0.00144" lon="0.00296"/>
+  <way id="-202804" user="overview-creator" visible="true">
+    <nd ref="-202801"/>
+    <nd ref="-202802"/>
+    <nd ref="-202803"/>
+    <nd ref="-202804"/>
+    <nd ref="-202801"/>
+    <tag k="religion" v="zoroastrian"/>
+    <tag k="name" v="zoroastrian"/>
   </way>
   <node id="-203800" user="overview-creator" visible="true" lat="-0.00190" lon="0.00300">
@@ -5061,11 +5214,45 @@
     <tag k="name" v="power_nuclear"/>
   </way>
-  <node id="-225000" user="overview-creator" visible="true" lat="-0.00250" lon="0.00330">
+  <node id="-224600" user="overview-creator" visible="true" lat="-0.00230" lon="0.00330">
     <tag k="tourism" v="information"/>
     <tag k="name" v="power"/>
   </node>
-  <node id="-225200" user="overview-creator" visible="true" lat="-0.00260" lon="0.00330">
+  <node id="-224800" user="overview-creator" visible="true" lat="-0.00240" lon="0.00330">
     <tag k="power" v="tower"/>
     <tag k="name" v="tower"/>
+  </node>
+  <node id="-224801" user="overview-creator" visible="true" lat="-0.00236" lon="0.00326"/>
+  <node id="-224802" user="overview-creator" visible="true" lat="-0.00236" lon="0.00354"/>
+  <node id="-224803" user="overview-creator" visible="true" lat="-0.00244" lon="0.00354"/>
+  <node id="-224804" user="overview-creator" visible="true" lat="-0.00244" lon="0.00326"/>
+  <way id="-224804" user="overview-creator" visible="true">
+    <nd ref="-224801"/>
+    <nd ref="-224802"/>
+    <nd ref="-224803"/>
+    <nd ref="-224804"/>
+    <nd ref="-224801"/>
+    <tag k="power" v="tower"/>
+    <tag k="name" v="tower"/>
+  </way>
+  <node id="-225000" user="overview-creator" visible="true" lat="-0.00250" lon="0.00330">
+    <tag k="power" v="line"/>
+    <tag k="name" v="line"/>
+  </node>
+  <node id="-225001" user="overview-creator" visible="true" lat="-0.00246" lon="0.00326"/>
+  <node id="-225002" user="overview-creator" visible="true" lat="-0.00246" lon="0.00354"/>
+  <node id="-225003" user="overview-creator" visible="true" lat="-0.00254" lon="0.00354"/>
+  <node id="-225004" user="overview-creator" visible="true" lat="-0.00254" lon="0.00326"/>
+  <way id="-225004" user="overview-creator" visible="true">
+    <nd ref="-225001"/>
+    <nd ref="-225002"/>
+    <nd ref="-225003"/>
+    <nd ref="-225004"/>
+    <nd ref="-225001"/>
+    <tag k="power" v="line"/>
+    <tag k="name" v="line"/>
+  </way>
+  <node id="-225200" user="overview-creator" visible="true" lat="-0.00260" lon="0.00330">
+    <tag k="power" v="station"/>
+    <tag k="name" v="station"/>
   </node>
   <node id="-225201" user="overview-creator" visible="true" lat="-0.00256" lon="0.00326"/>
@@ -5079,10 +5266,10 @@
     <nd ref="-225204"/>
     <nd ref="-225201"/>
-    <tag k="power" v="tower"/>
-    <tag k="name" v="tower"/>
+    <tag k="power" v="station"/>
+    <tag k="name" v="station"/>
   </way>
   <node id="-225400" user="overview-creator" visible="true" lat="-0.00270" lon="0.00330">
-    <tag k="power" v="line"/>
-    <tag k="name" v="line"/>
+    <tag k="power" v="sub_station"/>
+    <tag k="name" v="sub_station"/>
   </node>
   <node id="-225401" user="overview-creator" visible="true" lat="-0.00266" lon="0.00326"/>
@@ -5096,10 +5283,10 @@
     <nd ref="-225404"/>
     <nd ref="-225401"/>
-    <tag k="power" v="line"/>
-    <tag k="name" v="line"/>
-  </way>
-  <node id="-225600" user="overview-creator" visible="true" lat="-0.00280" lon="0.00330">
     <tag k="power" v="sub_station"/>
     <tag k="name" v="sub_station"/>
+  </way>
+  <node id="-225600" user="overview-creator" visible="true" lat="-0.00280" lon="0.00330">
+    <tag k="power" v="generator"/>
+    <tag k="name" v="generator"/>
   </node>
   <node id="-225601" user="overview-creator" visible="true" lat="-0.00276" lon="0.00326"/>
@@ -5113,21 +5300,4 @@
     <nd ref="-225604"/>
     <nd ref="-225601"/>
-    <tag k="power" v="sub_station"/>
-    <tag k="name" v="sub_station"/>
-  </way>
-  <node id="-225800" user="overview-creator" visible="true" lat="-0.00290" lon="0.00330">
-    <tag k="power" v="generator"/>
-    <tag k="name" v="generator"/>
-  </node>
-  <node id="-225801" user="overview-creator" visible="true" lat="-0.00286" lon="0.00326"/>
-  <node id="-225802" user="overview-creator" visible="true" lat="-0.00286" lon="0.00354"/>
-  <node id="-225803" user="overview-creator" visible="true" lat="-0.00294" lon="0.00354"/>
-  <node id="-225804" user="overview-creator" visible="true" lat="-0.00294" lon="0.00326"/>
-  <way id="-225804" user="overview-creator" visible="true">
-    <nd ref="-225801"/>
-    <nd ref="-225802"/>
-    <nd ref="-225803"/>
-    <nd ref="-225804"/>
-    <nd ref="-225801"/>
     <tag k="power" v="generator"/>
     <tag k="name" v="generator"/>
@@ -5189,6 +5359,6 @@
   </way>
   <node id="-226800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00330">
-    <tag k="power_source" v="nuclear"/>
-    <tag k="name" v="nuclear"/>
+    <tag k="power_source" v="coal"/>
+    <tag k="name" v="coal"/>
   </node>
   <node id="-226801" user="overview-creator" visible="true" lat="-0.00336" lon="0.00326"/>
@@ -5202,14 +5372,44 @@
     <nd ref="-226804"/>
     <nd ref="-226801"/>
+    <tag k="power_source" v="coal"/>
+    <tag k="name" v="coal"/>
+  </way>
+  <node id="-227000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00330">
+    <tag k="power_source" v="gas"/>
+    <tag k="name" v="gas"/>
+  </node>
+  <node id="-227001" user="overview-creator" visible="true" lat="-0.00346" lon="0.00326"/>
+  <node id="-227002" user="overview-creator" visible="true" lat="-0.00346" lon="0.00354"/>
+  <node id="-227003" user="overview-creator" visible="true" lat="-0.00354" lon="0.00354"/>
+  <node id="-227004" user="overview-creator" visible="true" lat="-0.00354" lon="0.00326"/>
+  <way id="-227004" user="overview-creator" visible="true">
+    <nd ref="-227001"/>
+    <nd ref="-227002"/>
+    <nd ref="-227003"/>
+    <nd ref="-227004"/>
+    <nd ref="-227001"/>
+    <tag k="power_source" v="gas"/>
+    <tag k="name" v="gas"/>
+  </way>
+  <node id="-227200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00330">
+    <tag k="power_source" v="photovoltaic"/>
+    <tag k="name" v="photovoltaic"/>
+  </node>
+  <node id="-227201" user="overview-creator" visible="true" lat="-0.00356" lon="0.00326"/>
+  <node id="-227202" user="overview-creator" visible="true" lat="-0.00356" lon="0.00354"/>
+  <node id="-227203" user="overview-creator" visible="true" lat="-0.00364" lon="0.00354"/>
+  <node id="-227204" user="overview-creator" visible="true" lat="-0.00364" lon="0.00326"/>
+  <way id="-227204" user="overview-creator" visible="true">
+    <nd ref="-227201"/>
+    <nd ref="-227202"/>
+    <nd ref="-227203"/>
+    <nd ref="-227204"/>
+    <nd ref="-227201"/>
+    <tag k="power_source" v="photovoltaic"/>
+    <tag k="name" v="photovoltaic"/>
+  </way>
+  <node id="-227400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00330">
     <tag k="power_source" v="nuclear"/>
     <tag k="name" v="nuclear"/>
-  </way>
-  <node id="-227200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00330">
-    <tag k="tourism" v="information"/>
-    <tag k="name" v="military"/>
-  </node>
-  <node id="-227400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00330">
-    <tag k="military" v="airfield"/>
-    <tag k="name" v="airfield"/>
   </node>
   <node id="-227401" user="overview-creator" visible="true" lat="-0.00366" lon="0.00326"/>
@@ -5223,74 +5423,6 @@
     <nd ref="-227404"/>
     <nd ref="-227401"/>
-    <tag k="military" v="airfield"/>
-    <tag k="name" v="airfield"/>
-  </way>
-  <node id="-227600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00330">
-    <tag k="military" v="bunker"/>
-    <tag k="name" v="bunker"/>
-  </node>
-  <node id="-227601" user="overview-creator" visible="true" lat="-0.00376" lon="0.00326"/>
-  <node id="-227602" user="overview-creator" visible="true" lat="-0.00376" lon="0.00354"/>
-  <node id="-227603" user="overview-creator" visible="true" lat="-0.00384" lon="0.00354"/>
-  <node id="-227604" user="overview-creator" visible="true" lat="-0.00384" lon="0.00326"/>
-  <way id="-227604" user="overview-creator" visible="true">
-    <nd ref="-227601"/>
-    <nd ref="-227602"/>
-    <nd ref="-227603"/>
-    <nd ref="-227604"/>
-    <nd ref="-227601"/>
-    <tag k="military" v="bunker"/>
-    <tag k="name" v="bunker"/>
-  </way>
-  <node id="-227800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00330">
-    <tag k="military" v="barracks"/>
-    <tag k="name" v="barracks"/>
-  </node>
-  <node id="-227801" user="overview-creator" visible="true" lat="-0.00386" lon="0.00326"/>
-  <node id="-227802" user="overview-creator" visible="true" lat="-0.00386" lon="0.00354"/>
-  <node id="-227803" user="overview-creator" visible="true" lat="-0.00394" lon="0.00354"/>
-  <node id="-227804" user="overview-creator" visible="true" lat="-0.00394" lon="0.00326"/>
-  <way id="-227804" user="overview-creator" visible="true">
-    <nd ref="-227801"/>
-    <nd ref="-227802"/>
-    <nd ref="-227803"/>
-    <nd ref="-227804"/>
-    <nd ref="-227801"/>
-    <tag k="military" v="barracks"/>
-    <tag k="name" v="barracks"/>
-  </way>
-  <node id="-228000" user="overview-creator" visible="true" lat="-0.00400" lon="0.00330">
-    <tag k="military" v="danger_area"/>
-    <tag k="name" v="danger_area"/>
-  </node>
-  <node id="-228001" user="overview-creator" visible="true" lat="-0.00396" lon="0.00326"/>
-  <node id="-228002" user="overview-creator" visible="true" lat="-0.00396" lon="0.00354"/>
-  <node id="-228003" user="overview-creator" visible="true" lat="-0.00404" lon="0.00354"/>
-  <node id="-228004" user="overview-creator" visible="true" lat="-0.00404" lon="0.00326"/>
-  <way id="-228004" user="overview-creator" visible="true">
-    <nd ref="-228001"/>
-    <nd ref="-228002"/>
-    <nd ref="-228003"/>
-    <nd ref="-228004"/>
-    <nd ref="-228001"/>
-    <tag k="military" v="danger_area"/>
-    <tag k="name" v="danger_area"/>
-  </way>
-  <node id="-228200" user="overview-creator" visible="true" lat="-0.00410" lon="0.00330">
-    <tag k="military" v="range"/>
-    <tag k="name" v="range"/>
-  </node>
-  <node id="-228201" user="overview-creator" visible="true" lat="-0.00406" lon="0.00326"/>
-  <node id="-228202" user="overview-creator" visible="true" lat="-0.00406" lon="0.00354"/>
-  <node id="-228203" user="overview-creator" visible="true" lat="-0.00414" lon="0.00354"/>
-  <node id="-228204" user="overview-creator" visible="true" lat="-0.00414" lon="0.00326"/>
-  <way id="-228204" user="overview-creator" visible="true">
-    <nd ref="-228201"/>
-    <nd ref="-228202"/>
-    <nd ref="-228203"/>
-    <nd ref="-228204"/>
-    <nd ref="-228201"/>
-    <tag k="military" v="range"/>
-    <tag k="name" v="range"/>
+    <tag k="power_source" v="nuclear"/>
+    <tag k="name" v="nuclear"/>
   </way>
   <node id="-240200" user="overview-creator" visible="true" lat="-0.00010" lon="0.00360">
@@ -5894,6 +6026,6 @@
   </way>
   <node id="-247400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00360">
-    <tag k="shop" v="tailor"/>
-    <tag k="name" v="tailor"/>
+    <tag k="shop" v="sports"/>
+    <tag k="name" v="sports"/>
   </node>
   <node id="-247401" user="overview-creator" visible="true" lat="-0.00366" lon="0.00356"/>
@@ -5907,10 +6039,10 @@
     <nd ref="-247404"/>
     <nd ref="-247401"/>
-    <tag k="shop" v="tailor"/>
-    <tag k="name" v="tailor"/>
+    <tag k="shop" v="sports"/>
+    <tag k="name" v="sports"/>
   </way>
   <node id="-247600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00360">
-    <tag k="shop" v="travel_agency"/>
-    <tag k="name" v="travel_agency"/>
+    <tag k="shop" v="stationery"/>
+    <tag k="name" v="stationery"/>
   </node>
   <node id="-247601" user="overview-creator" visible="true" lat="-0.00376" lon="0.00356"/>
@@ -5924,10 +6056,10 @@
     <nd ref="-247604"/>
     <nd ref="-247601"/>
-    <tag k="shop" v="travel_agency"/>
-    <tag k="name" v="travel_agency"/>
+    <tag k="shop" v="stationery"/>
+    <tag k="name" v="stationery"/>
   </way>
   <node id="-247800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00360">
-    <tag k="shop" v="toys"/>
-    <tag k="name" v="toys"/>
+    <tag k="shop" v="tailor"/>
+    <tag k="name" v="tailor"/>
   </node>
   <node id="-247801" user="overview-creator" visible="true" lat="-0.00386" lon="0.00356"/>
@@ -5941,10 +6073,10 @@
     <nd ref="-247804"/>
     <nd ref="-247801"/>
-    <tag k="shop" v="toys"/>
-    <tag k="name" v="toys"/>
+    <tag k="shop" v="tailor"/>
+    <tag k="name" v="tailor"/>
   </way>
   <node id="-248000" user="overview-creator" visible="true" lat="-0.00400" lon="0.00360">
-    <tag k="shop" v="video"/>
-    <tag k="name" v="video"/>
+    <tag k="shop" v="travel_agency"/>
+    <tag k="name" v="travel_agency"/>
   </node>
   <node id="-248001" user="overview-creator" visible="true" lat="-0.00396" lon="0.00356"/>
@@ -5958,10 +6090,10 @@
     <nd ref="-248004"/>
     <nd ref="-248001"/>
-    <tag k="shop" v="video"/>
-    <tag k="name" v="video"/>
+    <tag k="shop" v="travel_agency"/>
+    <tag k="name" v="travel_agency"/>
   </way>
   <node id="-248200" user="overview-creator" visible="true" lat="-0.00410" lon="0.00360">
-    <tag k="shop" v="shop_center"/>
-    <tag k="name" v="shop_center"/>
+    <tag k="shop" v="toys"/>
+    <tag k="name" v="toys"/>
   </node>
   <node id="-248201" user="overview-creator" visible="true" lat="-0.00406" lon="0.00356"/>
@@ -5975,6 +6107,40 @@
     <nd ref="-248204"/>
     <nd ref="-248201"/>
-    <tag k="shop" v="shop_center"/>
-    <tag k="name" v="shop_center"/>
+    <tag k="shop" v="toys"/>
+    <tag k="name" v="toys"/>
+  </way>
+  <node id="-266000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00390">
+    <tag k="shop" v="video"/>
+    <tag k="name" v="video"/>
+  </node>
+  <node id="-266001" user="overview-creator" visible="true" lat="-0.00296" lon="0.00386"/>
+  <node id="-266002" user="overview-creator" visible="true" lat="-0.00296" lon="0.00414"/>
+  <node id="-266003" user="overview-creator" visible="true" lat="-0.00304" lon="0.00414"/>
+  <node id="-266004" user="overview-creator" visible="true" lat="-0.00304" lon="0.00386"/>
+  <way id="-266004" user="overview-creator" visible="true">
+    <nd ref="-266001"/>
+    <nd ref="-266002"/>
+    <nd ref="-266003"/>
+    <nd ref="-266004"/>
+    <nd ref="-266001"/>
+    <tag k="shop" v="video"/>
+    <tag k="name" v="video"/>
+  </way>
+  <node id="-266200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00390">
+    <tag k="shop" v="shopping_centre"/>
+    <tag k="name" v="shopping_centre"/>
+  </node>
+  <node id="-266201" user="overview-creator" visible="true" lat="-0.00306" lon="0.00386"/>
+  <node id="-266202" user="overview-creator" visible="true" lat="-0.00306" lon="0.00414"/>
+  <node id="-266203" user="overview-creator" visible="true" lat="-0.00314" lon="0.00414"/>
+  <node id="-266204" user="overview-creator" visible="true" lat="-0.00314" lon="0.00386"/>
+  <way id="-266204" user="overview-creator" visible="true">
+    <nd ref="-266201"/>
+    <nd ref="-266202"/>
+    <nd ref="-266203"/>
+    <nd ref="-266204"/>
+    <nd ref="-266201"/>
+    <tag k="shop" v="shopping_centre"/>
+    <tag k="name" v="shopping_centre"/>
   </way>
   <node id="-260200" user="overview-creator" visible="true" lat="-0.00010" lon="0.00390">
@@ -6068,6 +6234,6 @@
   </way>
   <node id="-261400" user="overview-creator" visible="true" lat="-0.00070" lon="0.00390">
-    <tag k="tourism" v="camp_site"/>
-    <tag k="name" v="camp_site"/>
+    <tag k="tourism" v="alpine_hut"/>
+    <tag k="name" v="alpine_hut"/>
   </node>
   <node id="-261401" user="overview-creator" visible="true" lat="-0.00066" lon="0.00386"/>
@@ -6081,10 +6247,10 @@
     <nd ref="-261404"/>
     <nd ref="-261401"/>
+    <tag k="tourism" v="alpine_hut"/>
+    <tag k="name" v="alpine_hut"/>
+  </way>
+  <node id="-261600" user="overview-creator" visible="true" lat="-0.00080" lon="0.00390">
     <tag k="tourism" v="camp_site"/>
     <tag k="name" v="camp_site"/>
-  </way>
-  <node id="-261600" user="overview-creator" visible="true" lat="-0.00080" lon="0.00390">
-    <tag k="tourism" v="caravan_site"/>
-    <tag k="name" v="caravan_site"/>
   </node>
   <node id="-261601" user="overview-creator" visible="true" lat="-0.00076" lon="0.00386"/>
@@ -6098,10 +6264,10 @@
     <nd ref="-261604"/>
     <nd ref="-261601"/>
+    <tag k="tourism" v="camp_site"/>
+    <tag k="name" v="camp_site"/>
+  </way>
+  <node id="-261800" user="overview-creator" visible="true" lat="-0.00090" lon="0.00390">
     <tag k="tourism" v="caravan_site"/>
     <tag k="name" v="caravan_site"/>
-  </way>
-  <node id="-261800" user="overview-creator" visible="true" lat="-0.00090" lon="0.00390">
-    <tag k="tourism" v="picnic_site"/>
-    <tag k="name" v="picnic_site"/>
   </node>
   <node id="-261801" user="overview-creator" visible="true" lat="-0.00086" lon="0.00386"/>
@@ -6115,10 +6281,10 @@
     <nd ref="-261804"/>
     <nd ref="-261801"/>
+    <tag k="tourism" v="caravan_site"/>
+    <tag k="name" v="caravan_site"/>
+  </way>
+  <node id="-262000" user="overview-creator" visible="true" lat="-0.00100" lon="0.00390">
     <tag k="tourism" v="picnic_site"/>
     <tag k="name" v="picnic_site"/>
-  </way>
-  <node id="-262000" user="overview-creator" visible="true" lat="-0.00100" lon="0.00390">
-    <tag k="tourism" v="viewpoint"/>
-    <tag k="name" v="viewpoint"/>
   </node>
   <node id="-262001" user="overview-creator" visible="true" lat="-0.00096" lon="0.00386"/>
@@ -6132,10 +6298,10 @@
     <nd ref="-262004"/>
     <nd ref="-262001"/>
+    <tag k="tourism" v="picnic_site"/>
+    <tag k="name" v="picnic_site"/>
+  </way>
+  <node id="-262200" user="overview-creator" visible="true" lat="-0.00110" lon="0.00390">
     <tag k="tourism" v="viewpoint"/>
     <tag k="name" v="viewpoint"/>
-  </way>
-  <node id="-262200" user="overview-creator" visible="true" lat="-0.00110" lon="0.00390">
-    <tag k="tourism" v="theme_park"/>
-    <tag k="name" v="theme_park"/>
   </node>
   <node id="-262201" user="overview-creator" visible="true" lat="-0.00106" lon="0.00386"/>
@@ -6149,10 +6315,10 @@
     <nd ref="-262204"/>
     <nd ref="-262201"/>
+    <tag k="tourism" v="viewpoint"/>
+    <tag k="name" v="viewpoint"/>
+  </way>
+  <node id="-262400" user="overview-creator" visible="true" lat="-0.00120" lon="0.00390">
     <tag k="tourism" v="theme_park"/>
     <tag k="name" v="theme_park"/>
-  </way>
-  <node id="-262400" user="overview-creator" visible="true" lat="-0.00120" lon="0.00390">
-    <tag k="tourism" v="attraction"/>
-    <tag k="name" v="attraction"/>
   </node>
   <node id="-262401" user="overview-creator" visible="true" lat="-0.00116" lon="0.00386"/>
@@ -6166,10 +6332,10 @@
     <nd ref="-262404"/>
     <nd ref="-262401"/>
+    <tag k="tourism" v="theme_park"/>
+    <tag k="name" v="theme_park"/>
+  </way>
+  <node id="-262600" user="overview-creator" visible="true" lat="-0.00130" lon="0.00390">
     <tag k="tourism" v="attraction"/>
     <tag k="name" v="attraction"/>
-  </way>
-  <node id="-262600" user="overview-creator" visible="true" lat="-0.00130" lon="0.00390">
-    <tag k="tourism" v="zoo"/>
-    <tag k="name" v="zoo"/>
   </node>
   <node id="-262601" user="overview-creator" visible="true" lat="-0.00126" lon="0.00386"/>
@@ -6183,10 +6349,10 @@
     <nd ref="-262604"/>
     <nd ref="-262601"/>
+    <tag k="tourism" v="attraction"/>
+    <tag k="name" v="attraction"/>
+  </way>
+  <node id="-262800" user="overview-creator" visible="true" lat="-0.00140" lon="0.00390">
     <tag k="tourism" v="zoo"/>
     <tag k="name" v="zoo"/>
-  </way>
-  <node id="-262800" user="overview-creator" visible="true" lat="-0.00140" lon="0.00390">
-    <tag k="tourism" v="artwork"/>
-    <tag k="name" v="artwork"/>
   </node>
   <node id="-262801" user="overview-creator" visible="true" lat="-0.00136" lon="0.00386"/>
@@ -6200,10 +6366,10 @@
     <nd ref="-262804"/>
     <nd ref="-262801"/>
+    <tag k="tourism" v="zoo"/>
+    <tag k="name" v="zoo"/>
+  </way>
+  <node id="-263000" user="overview-creator" visible="true" lat="-0.00150" lon="0.00390">
     <tag k="tourism" v="artwork"/>
     <tag k="name" v="artwork"/>
-  </way>
-  <node id="-263000" user="overview-creator" visible="true" lat="-0.00150" lon="0.00390">
-    <tag k="tourism" v="museum"/>
-    <tag k="name" v="museum"/>
   </node>
   <node id="-263001" user="overview-creator" visible="true" lat="-0.00146" lon="0.00386"/>
@@ -6217,10 +6383,10 @@
     <nd ref="-263004"/>
     <nd ref="-263001"/>
+    <tag k="tourism" v="artwork"/>
+    <tag k="name" v="artwork"/>
+  </way>
+  <node id="-263200" user="overview-creator" visible="true" lat="-0.00160" lon="0.00390">
     <tag k="tourism" v="museum"/>
     <tag k="name" v="museum"/>
-  </way>
-  <node id="-263200" user="overview-creator" visible="true" lat="-0.00160" lon="0.00390">
-    <tag k="tourism" v="information"/>
-    <tag k="name" v="information"/>
   </node>
   <node id="-263201" user="overview-creator" visible="true" lat="-0.00156" lon="0.00386"/>
@@ -6234,4 +6400,21 @@
     <nd ref="-263204"/>
     <nd ref="-263201"/>
+    <tag k="tourism" v="museum"/>
+    <tag k="name" v="museum"/>
+  </way>
+  <node id="-263400" user="overview-creator" visible="true" lat="-0.00170" lon="0.00390">
+    <tag k="tourism" v="information"/>
+    <tag k="name" v="information"/>
+  </node>
+  <node id="-263401" user="overview-creator" visible="true" lat="-0.00166" lon="0.00386"/>
+  <node id="-263402" user="overview-creator" visible="true" lat="-0.00166" lon="0.00414"/>
+  <node id="-263403" user="overview-creator" visible="true" lat="-0.00174" lon="0.00414"/>
+  <node id="-263404" user="overview-creator" visible="true" lat="-0.00174" lon="0.00386"/>
+  <way id="-263404" user="overview-creator" visible="true">
+    <nd ref="-263401"/>
+    <nd ref="-263402"/>
+    <nd ref="-263403"/>
+    <nd ref="-263404"/>
+    <nd ref="-263401"/>
     <tag k="tourism" v="information"/>
     <tag k="name" v="information"/>
@@ -6428,4 +6611,93 @@
     <tag k="name" v="wildlife"/>
   </way>
+  <node id="-267200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00390">
+    <tag k="tourism" v="information"/>
+    <tag k="name" v="military"/>
+  </node>
+  <node id="-267400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00390">
+    <tag k="military" v="airfield"/>
+    <tag k="name" v="airfield"/>
+  </node>
+  <node id="-267401" user="overview-creator" visible="true" lat="-0.00366" lon="0.00386"/>
+  <node id="-267402" user="overview-creator" visible="true" lat="-0.00366" lon="0.00414"/>
+  <node id="-267403" user="overview-creator" visible="true" lat="-0.00374" lon="0.00414"/>
+  <node id="-267404" user="overview-creator" visible="true" lat="-0.00374" lon="0.00386"/>
+  <way id="-267404" user="overview-creator" visible="true">
+    <nd ref="-267401"/>
+    <nd ref="-267402"/>
+    <nd ref="-267403"/>
+    <nd ref="-267404"/>
+    <nd ref="-267401"/>
+    <tag k="military" v="airfield"/>
+    <tag k="name" v="airfield"/>
+  </way>
+  <node id="-267600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00390">
+    <tag k="military" v="bunker"/>
+    <tag k="name" v="bunker"/>
+  </node>
+  <node id="-267601" user="overview-creator" visible="true" lat="-0.00376" lon="0.00386"/>
+  <node id="-267602" user="overview-creator" visible="true" lat="-0.00376" lon="0.00414"/>
+  <node id="-267603" user="overview-creator" visible="true" lat="-0.00384" lon="0.00414"/>
+  <node id="-267604" user="overview-creator" visible="true" lat="-0.00384" lon="0.00386"/>
+  <way id="-267604" user="overview-creator" visible="true">
+    <nd ref="-267601"/>
+    <nd ref="-267602"/>
+    <nd ref="-267603"/>
+    <nd ref="-267604"/>
+    <nd ref="-267601"/>
+    <tag k="military" v="bunker"/>
+    <tag k="name" v="bunker"/>
+  </way>
+  <node id="-267800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00390">
+    <tag k="military" v="barracks"/>
+    <tag k="name" v="barracks"/>
+  </node>
+  <node id="-267801" user="overview-creator" visible="true" lat="-0.00386" lon="0.00386"/>
+  <node id="-267802" user="overview-creator" visible="true" lat="-0.00386" lon="0.00414"/>
+  <node id="-267803" user="overview-creator" visible="true" lat="-0.00394" lon="0.00414"/>
+  <node id="-267804" user="overview-creator" visible="true" lat="-0.00394" lon="0.00386"/>
+  <way id="-267804" user="overview-creator" visible="true">
+    <nd ref="-267801"/>
+    <nd ref="-267802"/>
+    <nd ref="-267803"/>
+    <nd ref="-267804"/>
+    <nd ref="-267801"/>
+    <tag k="military" v="barracks"/>
+    <tag k="name" v="barracks"/>
+  </way>
+  <node id="-268000" user="overview-creator" visible="true" lat="-0.00400" lon="0.00390">
+    <tag k="military" v="danger_area"/>
+    <tag k="name" v="danger_area"/>
+  </node>
+  <node id="-268001" user="overview-creator" visible="true" lat="-0.00396" lon="0.00386"/>
+  <node id="-268002" user="overview-creator" visible="true" lat="-0.00396" lon="0.00414"/>
+  <node id="-268003" user="overview-creator" visible="true" lat="-0.00404" lon="0.00414"/>
+  <node id="-268004" user="overview-creator" visible="true" lat="-0.00404" lon="0.00386"/>
+  <way id="-268004" user="overview-creator" visible="true">
+    <nd ref="-268001"/>
+    <nd ref="-268002"/>
+    <nd ref="-268003"/>
+    <nd ref="-268004"/>
+    <nd ref="-268001"/>
+    <tag k="military" v="danger_area"/>
+    <tag k="name" v="danger_area"/>
+  </way>
+  <node id="-268200" user="overview-creator" visible="true" lat="-0.00410" lon="0.00390">
+    <tag k="military" v="range"/>
+    <tag k="name" v="range"/>
+  </node>
+  <node id="-268201" user="overview-creator" visible="true" lat="-0.00406" lon="0.00386"/>
+  <node id="-268202" user="overview-creator" visible="true" lat="-0.00406" lon="0.00414"/>
+  <node id="-268203" user="overview-creator" visible="true" lat="-0.00414" lon="0.00414"/>
+  <node id="-268204" user="overview-creator" visible="true" lat="-0.00414" lon="0.00386"/>
+  <way id="-268204" user="overview-creator" visible="true">
+    <nd ref="-268201"/>
+    <nd ref="-268202"/>
+    <nd ref="-268203"/>
+    <nd ref="-268204"/>
+    <nd ref="-268201"/>
+    <tag k="military" v="range"/>
+    <tag k="name" v="range"/>
+  </way>
   <node id="-280200" user="overview-creator" visible="true" lat="-0.00010" lon="0.00420">
     <tag k="tourism" v="information"/>
@@ -6552,6 +6824,6 @@
   </way>
   <node id="-281800" user="overview-creator" visible="true" lat="-0.00090" lon="0.00420">
-    <tag k="sport" v="climbing"/>
-    <tag k="name" v="climbing"/>
+    <tag k="sport" v="canoe"/>
+    <tag k="name" v="canoe"/>
   </node>
   <node id="-281801" user="overview-creator" visible="true" lat="-0.00086" lon="0.00416"/>
@@ -6565,10 +6837,10 @@
     <nd ref="-281804"/>
     <nd ref="-281801"/>
+    <tag k="sport" v="canoe"/>
+    <tag k="name" v="canoe"/>
+  </way>
+  <node id="-282000" user="overview-creator" visible="true" lat="-0.00100" lon="0.00420">
     <tag k="sport" v="climbing"/>
     <tag k="name" v="climbing"/>
-  </way>
-  <node id="-282000" user="overview-creator" visible="true" lat="-0.00100" lon="0.00420">
-    <tag k="sport" v="cricket"/>
-    <tag k="name" v="cricket"/>
   </node>
   <node id="-282001" user="overview-creator" visible="true" lat="-0.00096" lon="0.00416"/>
@@ -6582,10 +6854,10 @@
     <nd ref="-282004"/>
     <nd ref="-282001"/>
+    <tag k="sport" v="climbing"/>
+    <tag k="name" v="climbing"/>
+  </way>
+  <node id="-282200" user="overview-creator" visible="true" lat="-0.00110" lon="0.00420">
     <tag k="sport" v="cricket"/>
     <tag k="name" v="cricket"/>
-  </way>
-  <node id="-282200" user="overview-creator" visible="true" lat="-0.00110" lon="0.00420">
-    <tag k="sport" v="cricket_nets"/>
-    <tag k="name" v="cricket_nets"/>
   </node>
   <node id="-282201" user="overview-creator" visible="true" lat="-0.00106" lon="0.00416"/>
@@ -6599,10 +6871,10 @@
     <nd ref="-282204"/>
     <nd ref="-282201"/>
+    <tag k="sport" v="cricket"/>
+    <tag k="name" v="cricket"/>
+  </way>
+  <node id="-282400" user="overview-creator" visible="true" lat="-0.00120" lon="0.00420">
     <tag k="sport" v="cricket_nets"/>
     <tag k="name" v="cricket_nets"/>
-  </way>
-  <node id="-282400" user="overview-creator" visible="true" lat="-0.00120" lon="0.00420">
-    <tag k="sport" v="croquet"/>
-    <tag k="name" v="croquet"/>
   </node>
   <node id="-282401" user="overview-creator" visible="true" lat="-0.00116" lon="0.00416"/>
@@ -6616,10 +6888,10 @@
     <nd ref="-282404"/>
     <nd ref="-282401"/>
+    <tag k="sport" v="cricket_nets"/>
+    <tag k="name" v="cricket_nets"/>
+  </way>
+  <node id="-282600" user="overview-creator" visible="true" lat="-0.00130" lon="0.00420">
     <tag k="sport" v="croquet"/>
     <tag k="name" v="croquet"/>
-  </way>
-  <node id="-282600" user="overview-creator" visible="true" lat="-0.00130" lon="0.00420">
-    <tag k="sport" v="cycling"/>
-    <tag k="name" v="cycling"/>
   </node>
   <node id="-282601" user="overview-creator" visible="true" lat="-0.00126" lon="0.00416"/>
@@ -6633,10 +6905,10 @@
     <nd ref="-282604"/>
     <nd ref="-282601"/>
+    <tag k="sport" v="croquet"/>
+    <tag k="name" v="croquet"/>
+  </way>
+  <node id="-282800" user="overview-creator" visible="true" lat="-0.00140" lon="0.00420">
     <tag k="sport" v="cycling"/>
     <tag k="name" v="cycling"/>
-  </way>
-  <node id="-282800" user="overview-creator" visible="true" lat="-0.00140" lon="0.00420">
-    <tag k="sport" v="dog_racing"/>
-    <tag k="name" v="dog_racing"/>
   </node>
   <node id="-282801" user="overview-creator" visible="true" lat="-0.00136" lon="0.00416"/>
@@ -6650,10 +6922,10 @@
     <nd ref="-282804"/>
     <nd ref="-282801"/>
+    <tag k="sport" v="cycling"/>
+    <tag k="name" v="cycling"/>
+  </way>
+  <node id="-283000" user="overview-creator" visible="true" lat="-0.00150" lon="0.00420">
     <tag k="sport" v="dog_racing"/>
     <tag k="name" v="dog_racing"/>
-  </way>
-  <node id="-283000" user="overview-creator" visible="true" lat="-0.00150" lon="0.00420">
-    <tag k="sport" v="equestrian"/>
-    <tag k="name" v="equestrian"/>
   </node>
   <node id="-283001" user="overview-creator" visible="true" lat="-0.00146" lon="0.00416"/>
@@ -6667,10 +6939,10 @@
     <nd ref="-283004"/>
     <nd ref="-283001"/>
+    <tag k="sport" v="dog_racing"/>
+    <tag k="name" v="dog_racing"/>
+  </way>
+  <node id="-283200" user="overview-creator" visible="true" lat="-0.00160" lon="0.00420">
     <tag k="sport" v="equestrian"/>
     <tag k="name" v="equestrian"/>
-  </way>
-  <node id="-283200" user="overview-creator" visible="true" lat="-0.00160" lon="0.00420">
-    <tag k="sport" v="football"/>
-    <tag k="name" v="football"/>
   </node>
   <node id="-283201" user="overview-creator" visible="true" lat="-0.00156" lon="0.00416"/>
@@ -6684,10 +6956,10 @@
     <nd ref="-283204"/>
     <nd ref="-283201"/>
+    <tag k="sport" v="equestrian"/>
+    <tag k="name" v="equestrian"/>
+  </way>
+  <node id="-283400" user="overview-creator" visible="true" lat="-0.00170" lon="0.00420">
     <tag k="sport" v="football"/>
     <tag k="name" v="football"/>
-  </way>
-  <node id="-283400" user="overview-creator" visible="true" lat="-0.00170" lon="0.00420">
-    <tag k="sport" v="golf"/>
-    <tag k="name" v="golf"/>
   </node>
   <node id="-283401" user="overview-creator" visible="true" lat="-0.00166" lon="0.00416"/>
@@ -6701,10 +6973,10 @@
     <nd ref="-283404"/>
     <nd ref="-283401"/>
+    <tag k="sport" v="football"/>
+    <tag k="name" v="football"/>
+  </way>
+  <node id="-283600" user="overview-creator" visible="true" lat="-0.00180" lon="0.00420">
     <tag k="sport" v="golf"/>
     <tag k="name" v="golf"/>
-  </way>
-  <node id="-283600" user="overview-creator" visible="true" lat="-0.00180" lon="0.00420">
-    <tag k="sport" v="gymnastics"/>
-    <tag k="name" v="gymnastics"/>
   </node>
   <node id="-283601" user="overview-creator" visible="true" lat="-0.00176" lon="0.00416"/>
@@ -6718,10 +6990,10 @@
     <nd ref="-283604"/>
     <nd ref="-283601"/>
+    <tag k="sport" v="golf"/>
+    <tag k="name" v="golf"/>
+  </way>
+  <node id="-283800" user="overview-creator" visible="true" lat="-0.00190" lon="0.00420">
     <tag k="sport" v="gymnastics"/>
     <tag k="name" v="gymnastics"/>
-  </way>
-  <node id="-283800" user="overview-creator" visible="true" lat="-0.00190" lon="0.00420">
-    <tag k="sport" v="hockey"/>
-    <tag k="name" v="hockey"/>
   </node>
   <node id="-283801" user="overview-creator" visible="true" lat="-0.00186" lon="0.00416"/>
@@ -6735,10 +7007,10 @@
     <nd ref="-283804"/>
     <nd ref="-283801"/>
+    <tag k="sport" v="gymnastics"/>
+    <tag k="name" v="gymnastics"/>
+  </way>
+  <node id="-284000" user="overview-creator" visible="true" lat="-0.00200" lon="0.00420">
     <tag k="sport" v="hockey"/>
     <tag k="name" v="hockey"/>
-  </way>
-  <node id="-284000" user="overview-creator" visible="true" lat="-0.00200" lon="0.00420">
-    <tag k="sport" v="horse_racing"/>
-    <tag k="name" v="horse_racing"/>
   </node>
   <node id="-284001" user="overview-creator" visible="true" lat="-0.00196" lon="0.00416"/>
@@ -6752,10 +7024,10 @@
     <nd ref="-284004"/>
     <nd ref="-284001"/>
+    <tag k="sport" v="hockey"/>
+    <tag k="name" v="hockey"/>
+  </way>
+  <node id="-284200" user="overview-creator" visible="true" lat="-0.00210" lon="0.00420">
     <tag k="sport" v="horse_racing"/>
     <tag k="name" v="horse_racing"/>
-  </way>
-  <node id="-284200" user="overview-creator" visible="true" lat="-0.00210" lon="0.00420">
-    <tag k="sport" v="motor"/>
-    <tag k="name" v="motor"/>
   </node>
   <node id="-284201" user="overview-creator" visible="true" lat="-0.00206" lon="0.00416"/>
@@ -6769,10 +7041,10 @@
     <nd ref="-284204"/>
     <nd ref="-284201"/>
+    <tag k="sport" v="horse_racing"/>
+    <tag k="name" v="horse_racing"/>
+  </way>
+  <node id="-284400" user="overview-creator" visible="true" lat="-0.00220" lon="0.00420">
     <tag k="sport" v="motor"/>
     <tag k="name" v="motor"/>
-  </way>
-  <node id="-284400" user="overview-creator" visible="true" lat="-0.00220" lon="0.00420">
-    <tag k="sport" v="multi"/>
-    <tag k="name" v="multi"/>
   </node>
   <node id="-284401" user="overview-creator" visible="true" lat="-0.00216" lon="0.00416"/>
@@ -6786,10 +7058,10 @@
     <nd ref="-284404"/>
     <nd ref="-284401"/>
+    <tag k="sport" v="motor"/>
+    <tag k="name" v="motor"/>
+  </way>
+  <node id="-284600" user="overview-creator" visible="true" lat="-0.00230" lon="0.00420">
     <tag k="sport" v="multi"/>
     <tag k="name" v="multi"/>
-  </way>
-  <node id="-284600" user="overview-creator" visible="true" lat="-0.00230" lon="0.00420">
-    <tag k="sport" v="pelota"/>
-    <tag k="name" v="pelota"/>
   </node>
   <node id="-284601" user="overview-creator" visible="true" lat="-0.00226" lon="0.00416"/>
@@ -6803,10 +7075,10 @@
     <nd ref="-284604"/>
     <nd ref="-284601"/>
+    <tag k="sport" v="multi"/>
+    <tag k="name" v="multi"/>
+  </way>
+  <node id="-284800" user="overview-creator" visible="true" lat="-0.00240" lon="0.00420">
     <tag k="sport" v="pelota"/>
     <tag k="name" v="pelota"/>
-  </way>
-  <node id="-284800" user="overview-creator" visible="true" lat="-0.00240" lon="0.00420">
-    <tag k="sport" v="racquet"/>
-    <tag k="name" v="racquet"/>
   </node>
   <node id="-284801" user="overview-creator" visible="true" lat="-0.00236" lon="0.00416"/>
@@ -6820,10 +7092,10 @@
     <nd ref="-284804"/>
     <nd ref="-284801"/>
+    <tag k="sport" v="pelota"/>
+    <tag k="name" v="pelota"/>
+  </way>
+  <node id="-285000" user="overview-creator" visible="true" lat="-0.00250" lon="0.00420">
     <tag k="sport" v="racquet"/>
     <tag k="name" v="racquet"/>
-  </way>
-  <node id="-285000" user="overview-creator" visible="true" lat="-0.00250" lon="0.00420">
-    <tag k="sport" v="rugby"/>
-    <tag k="name" v="rugby"/>
   </node>
   <node id="-285001" user="overview-creator" visible="true" lat="-0.00246" lon="0.00416"/>
@@ -6837,10 +7109,10 @@
     <nd ref="-285004"/>
     <nd ref="-285001"/>
+    <tag k="sport" v="racquet"/>
+    <tag k="name" v="racquet"/>
+  </way>
+  <node id="-285200" user="overview-creator" visible="true" lat="-0.00260" lon="0.00420">
     <tag k="sport" v="rugby"/>
     <tag k="name" v="rugby"/>
-  </way>
-  <node id="-285200" user="overview-creator" visible="true" lat="-0.00260" lon="0.00420">
-    <tag k="sport" v="skating"/>
-    <tag k="name" v="skating"/>
   </node>
   <node id="-285201" user="overview-creator" visible="true" lat="-0.00256" lon="0.00416"/>
@@ -6854,10 +7126,10 @@
     <nd ref="-285204"/>
     <nd ref="-285201"/>
+    <tag k="sport" v="rugby"/>
+    <tag k="name" v="rugby"/>
+  </way>
+  <node id="-285400" user="overview-creator" visible="true" lat="-0.00270" lon="0.00420">
     <tag k="sport" v="skating"/>
     <tag k="name" v="skating"/>
-  </way>
-  <node id="-285400" user="overview-creator" visible="true" lat="-0.00270" lon="0.00420">
-    <tag k="sport" v="skateboard"/>
-    <tag k="name" v="skateboard"/>
   </node>
   <node id="-285401" user="overview-creator" visible="true" lat="-0.00266" lon="0.00416"/>
@@ -6871,10 +7143,10 @@
     <nd ref="-285404"/>
     <nd ref="-285401"/>
+    <tag k="sport" v="skating"/>
+    <tag k="name" v="skating"/>
+  </way>
+  <node id="-285600" user="overview-creator" visible="true" lat="-0.00280" lon="0.00420">
     <tag k="sport" v="skateboard"/>
     <tag k="name" v="skateboard"/>
-  </way>
-  <node id="-285600" user="overview-creator" visible="true" lat="-0.00280" lon="0.00420">
-    <tag k="sport" v="soccer"/>
-    <tag k="name" v="soccer"/>
   </node>
   <node id="-285601" user="overview-creator" visible="true" lat="-0.00276" lon="0.00416"/>
@@ -6888,10 +7160,10 @@
     <nd ref="-285604"/>
     <nd ref="-285601"/>
+    <tag k="sport" v="skateboard"/>
+    <tag k="name" v="skateboard"/>
+  </way>
+  <node id="-285800" user="overview-creator" visible="true" lat="-0.00290" lon="0.00420">
     <tag k="sport" v="soccer"/>
     <tag k="name" v="soccer"/>
-  </way>
-  <node id="-285800" user="overview-creator" visible="true" lat="-0.00290" lon="0.00420">
-    <tag k="sport" v="swimming"/>
-    <tag k="name" v="swimming"/>
   </node>
   <node id="-285801" user="overview-creator" visible="true" lat="-0.00286" lon="0.00416"/>
@@ -6905,10 +7177,10 @@
     <nd ref="-285804"/>
     <nd ref="-285801"/>
+    <tag k="sport" v="soccer"/>
+    <tag k="name" v="soccer"/>
+  </way>
+  <node id="-286000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00420">
     <tag k="sport" v="swimming"/>
     <tag k="name" v="swimming"/>
-  </way>
-  <node id="-286000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00420">
-    <tag k="sport" v="skiing"/>
-    <tag k="name" v="skiing"/>
   </node>
   <node id="-286001" user="overview-creator" visible="true" lat="-0.00296" lon="0.00416"/>
@@ -6922,10 +7194,10 @@
     <nd ref="-286004"/>
     <nd ref="-286001"/>
+    <tag k="sport" v="swimming"/>
+    <tag k="name" v="swimming"/>
+  </way>
+  <node id="-286200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00420">
     <tag k="sport" v="skiing"/>
     <tag k="name" v="skiing"/>
-  </way>
-  <node id="-286200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00420">
-    <tag k="sport" v="table_tennis"/>
-    <tag k="name" v="table_tennis"/>
   </node>
   <node id="-286201" user="overview-creator" visible="true" lat="-0.00306" lon="0.00416"/>
@@ -6939,10 +7211,10 @@
     <nd ref="-286204"/>
     <nd ref="-286201"/>
+    <tag k="sport" v="skiing"/>
+    <tag k="name" v="skiing"/>
+  </way>
+  <node id="-286400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00420">
     <tag k="sport" v="table_tennis"/>
     <tag k="name" v="table_tennis"/>
-  </way>
-  <node id="-286400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00420">
-    <tag k="sport" v="tennis"/>
-    <tag k="name" v="tennis"/>
   </node>
   <node id="-286401" user="overview-creator" visible="true" lat="-0.00316" lon="0.00416"/>
@@ -6956,10 +7228,10 @@
     <nd ref="-286404"/>
     <nd ref="-286401"/>
+    <tag k="sport" v="table_tennis"/>
+    <tag k="name" v="table_tennis"/>
+  </way>
+  <node id="-286600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00420">
     <tag k="sport" v="tennis"/>
     <tag k="name" v="tennis"/>
-  </way>
-  <node id="-286600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00420">
-    <tag k="sport" v="paintball"/>
-    <tag k="name" v="paintball"/>
   </node>
   <node id="-286601" user="overview-creator" visible="true" lat="-0.00326" lon="0.00416"/>
@@ -6973,10 +7245,10 @@
     <nd ref="-286604"/>
     <nd ref="-286601"/>
+    <tag k="sport" v="tennis"/>
+    <tag k="name" v="tennis"/>
+  </way>
+  <node id="-286800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00420">
     <tag k="sport" v="paintball"/>
     <tag k="name" v="paintball"/>
-  </way>
-  <node id="-286800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00420">
-    <tag k="sport" v="squash"/>
-    <tag k="name" v="squash"/>
   </node>
   <node id="-286801" user="overview-creator" visible="true" lat="-0.00336" lon="0.00416"/>
@@ -6990,10 +7262,10 @@
     <nd ref="-286804"/>
     <nd ref="-286801"/>
+    <tag k="sport" v="paintball"/>
+    <tag k="name" v="paintball"/>
+  </way>
+  <node id="-287000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00420">
     <tag k="sport" v="squash"/>
     <tag k="name" v="squash"/>
-  </way>
-  <node id="-287000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00420">
-    <tag k="sport" v="shooting"/>
-    <tag k="name" v="shooting"/>
   </node>
   <node id="-287001" user="overview-creator" visible="true" lat="-0.00346" lon="0.00416"/>
@@ -7007,10 +7279,10 @@
     <nd ref="-287004"/>
     <nd ref="-287001"/>
+    <tag k="sport" v="squash"/>
+    <tag k="name" v="squash"/>
+  </way>
+  <node id="-287200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00420">
     <tag k="sport" v="shooting"/>
     <tag k="name" v="shooting"/>
-  </way>
-  <node id="-287200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00420">
-    <tag k="sport" v="volleyball"/>
-    <tag k="name" v="volleyball"/>
   </node>
   <node id="-287201" user="overview-creator" visible="true" lat="-0.00356" lon="0.00416"/>
@@ -7024,10 +7296,10 @@
     <nd ref="-287204"/>
     <nd ref="-287201"/>
+    <tag k="sport" v="shooting"/>
+    <tag k="name" v="shooting"/>
+  </way>
+  <node id="-287400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00420">
     <tag k="sport" v="volleyball"/>
     <tag k="name" v="volleyball"/>
-  </way>
-  <node id="-287400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00420">
-    <tag k="sport" v="beachvolleyball"/>
-    <tag k="name" v="beachvolleyball"/>
   </node>
   <node id="-287401" user="overview-creator" visible="true" lat="-0.00366" lon="0.00416"/>
@@ -7041,10 +7313,10 @@
     <nd ref="-287404"/>
     <nd ref="-287401"/>
+    <tag k="sport" v="volleyball"/>
+    <tag k="name" v="volleyball"/>
+  </way>
+  <node id="-287600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00420">
     <tag k="sport" v="beachvolleyball"/>
     <tag k="name" v="beachvolleyball"/>
-  </way>
-  <node id="-287600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00420">
-    <tag k="sport" v="bowling"/>
-    <tag k="name" v="bowling"/>
   </node>
   <node id="-287601" user="overview-creator" visible="true" lat="-0.00376" lon="0.00416"/>
@@ -7058,10 +7330,10 @@
     <nd ref="-287604"/>
     <nd ref="-287601"/>
+    <tag k="sport" v="beachvolleyball"/>
+    <tag k="name" v="beachvolleyball"/>
+  </way>
+  <node id="-287800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00420">
     <tag k="sport" v="bowling"/>
     <tag k="name" v="bowling"/>
-  </way>
-  <node id="-287800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00420">
-    <tag k="sport" v="handball"/>
-    <tag k="name" v="handball"/>
   </node>
   <node id="-287801" user="overview-creator" visible="true" lat="-0.00386" lon="0.00416"/>
@@ -7075,10 +7347,10 @@
     <nd ref="-287804"/>
     <nd ref="-287801"/>
+    <tag k="sport" v="bowling"/>
+    <tag k="name" v="bowling"/>
+  </way>
+  <node id="-288000" user="overview-creator" visible="true" lat="-0.00400" lon="0.00420">
     <tag k="sport" v="handball"/>
     <tag k="name" v="handball"/>
-  </way>
-  <node id="-288000" user="overview-creator" visible="true" lat="-0.00400" lon="0.00420">
-    <tag k="sport" v="rowing"/>
-    <tag k="name" v="rowing"/>
   </node>
   <node id="-288001" user="overview-creator" visible="true" lat="-0.00396" lon="0.00416"/>
@@ -7092,10 +7364,10 @@
     <nd ref="-288004"/>
     <nd ref="-288001"/>
+    <tag k="sport" v="handball"/>
+    <tag k="name" v="handball"/>
+  </way>
+  <node id="-288200" user="overview-creator" visible="true" lat="-0.00410" lon="0.00420">
     <tag k="sport" v="rowing"/>
     <tag k="name" v="rowing"/>
-  </way>
-  <node id="-288200" user="overview-creator" visible="true" lat="-0.00410" lon="0.00420">
-    <tag k="sport" v="sailing"/>
-    <tag k="name" v="sailing"/>
   </node>
   <node id="-288201" user="overview-creator" visible="true" lat="-0.00406" lon="0.00416"/>
@@ -7109,10 +7381,10 @@
     <nd ref="-288204"/>
     <nd ref="-288201"/>
+    <tag k="sport" v="rowing"/>
+    <tag k="name" v="rowing"/>
+  </way>
+  <node id="-306000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00450">
     <tag k="sport" v="sailing"/>
     <tag k="name" v="sailing"/>
-  </way>
-  <node id="-306000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00450">
-    <tag k="sport" v="diving"/>
-    <tag k="name" v="diving"/>
   </node>
   <node id="-306001" user="overview-creator" visible="true" lat="-0.00296" lon="0.00446"/>
@@ -7126,10 +7398,10 @@
     <nd ref="-306004"/>
     <nd ref="-306001"/>
+    <tag k="sport" v="sailing"/>
+    <tag k="name" v="sailing"/>
+  </way>
+  <node id="-306200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00450">
     <tag k="sport" v="diving"/>
     <tag k="name" v="diving"/>
-  </way>
-  <node id="-306200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00450">
-    <tag k="sport" v="badminton"/>
-    <tag k="name" v="badminton"/>
   </node>
   <node id="-306201" user="overview-creator" visible="true" lat="-0.00306" lon="0.00446"/>
@@ -7143,10 +7415,10 @@
     <nd ref="-306204"/>
     <nd ref="-306201"/>
+    <tag k="sport" v="diving"/>
+    <tag k="name" v="diving"/>
+  </way>
+  <node id="-306400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00450">
     <tag k="sport" v="badminton"/>
     <tag k="name" v="badminton"/>
-  </way>
-  <node id="-306400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00450">
-    <tag k="sport" v="archery"/>
-    <tag k="name" v="archery"/>
   </node>
   <node id="-306401" user="overview-creator" visible="true" lat="-0.00316" lon="0.00446"/>
@@ -7160,10 +7432,10 @@
     <nd ref="-306404"/>
     <nd ref="-306401"/>
+    <tag k="sport" v="badminton"/>
+    <tag k="name" v="badminton"/>
+  </way>
+  <node id="-306600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00450">
     <tag k="sport" v="archery"/>
     <tag k="name" v="archery"/>
-  </way>
-  <node id="-306600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00450">
-    <tag k="sport" v="fishing"/>
-    <tag k="name" v="fishing"/>
   </node>
   <node id="-306601" user="overview-creator" visible="true" lat="-0.00326" lon="0.00446"/>
@@ -7177,4 +7449,21 @@
     <nd ref="-306604"/>
     <nd ref="-306601"/>
+    <tag k="sport" v="archery"/>
+    <tag k="name" v="archery"/>
+  </way>
+  <node id="-306800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00450">
+    <tag k="sport" v="fishing"/>
+    <tag k="name" v="fishing"/>
+  </node>
+  <node id="-306801" user="overview-creator" visible="true" lat="-0.00336" lon="0.00446"/>
+  <node id="-306802" user="overview-creator" visible="true" lat="-0.00336" lon="0.00474"/>
+  <node id="-306803" user="overview-creator" visible="true" lat="-0.00344" lon="0.00474"/>
+  <node id="-306804" user="overview-creator" visible="true" lat="-0.00344" lon="0.00446"/>
+  <way id="-306804" user="overview-creator" visible="true">
+    <nd ref="-306801"/>
+    <nd ref="-306802"/>
+    <nd ref="-306803"/>
+    <nd ref="-306804"/>
+    <nd ref="-306801"/>
     <tag k="sport" v="fishing"/>
     <tag k="name" v="fishing"/>
@@ -7576,6 +7865,6 @@
   </way>
   <node id="-325000" user="overview-creator" visible="true" lat="-0.00250" lon="0.00480">
-    <tag k="landuse" v="leisure_ground"/>
-    <tag k="name" v="leisure_ground"/>
+    <tag k="landuse" v="recreation_ground"/>
+    <tag k="name" v="recreation_ground"/>
   </node>
   <node id="-325001" user="overview-creator" visible="true" lat="-0.00246" lon="0.00476"/>
@@ -7589,6 +7878,6 @@
     <nd ref="-325004"/>
     <nd ref="-325001"/>
-    <tag k="landuse" v="leisure_ground"/>
-    <tag k="name" v="leisure_ground"/>
+    <tag k="landuse" v="recreation_ground"/>
+    <tag k="name" v="recreation_ground"/>
   </way>
   <node id="-325400" user="overview-creator" visible="true" lat="-0.00270" lon="0.00480">
@@ -8085,6 +8374,6 @@
   </way>
   <node id="-342600" user="overview-creator" visible="true" lat="-0.00130" lon="0.00510">
-    <tag k="natural" v="water"/>
-    <tag k="name" v="water"/>
+    <tag k="natural" v="wetland"/>
+    <tag k="name" v="wetland"/>
   </node>
   <node id="-342601" user="overview-creator" visible="true" lat="-0.00126" lon="0.00506"/>
@@ -8098,10 +8387,10 @@
     <nd ref="-342604"/>
     <nd ref="-342601"/>
+    <tag k="natural" v="wetland"/>
+    <tag k="name" v="wetland"/>
+  </way>
+  <node id="-342800" user="overview-creator" visible="true" lat="-0.00140" lon="0.00510">
     <tag k="natural" v="water"/>
     <tag k="name" v="water"/>
-  </way>
-  <node id="-342800" user="overview-creator" visible="true" lat="-0.00140" lon="0.00510">
-    <tag k="natural" v="coastline"/>
-    <tag k="name" v="coastline"/>
   </node>
   <node id="-342801" user="overview-creator" visible="true" lat="-0.00136" lon="0.00506"/>
@@ -8115,10 +8404,10 @@
     <nd ref="-342804"/>
     <nd ref="-342801"/>
+    <tag k="natural" v="water"/>
+    <tag k="name" v="water"/>
+  </way>
+  <node id="-343000" user="overview-creator" visible="true" lat="-0.00150" lon="0.00510">
     <tag k="natural" v="coastline"/>
     <tag k="name" v="coastline"/>
-  </way>
-  <node id="-343000" user="overview-creator" visible="true" lat="-0.00150" lon="0.00510">
-    <tag k="natural" v="mud"/>
-    <tag k="name" v="mud"/>
   </node>
   <node id="-343001" user="overview-creator" visible="true" lat="-0.00146" lon="0.00506"/>
@@ -8132,10 +8421,10 @@
     <nd ref="-343004"/>
     <nd ref="-343001"/>
+    <tag k="natural" v="coastline"/>
+    <tag k="name" v="coastline"/>
+  </way>
+  <node id="-343200" user="overview-creator" visible="true" lat="-0.00160" lon="0.00510">
     <tag k="natural" v="mud"/>
     <tag k="name" v="mud"/>
-  </way>
-  <node id="-343200" user="overview-creator" visible="true" lat="-0.00160" lon="0.00510">
-    <tag k="natural" v="beach"/>
-    <tag k="name" v="beach"/>
   </node>
   <node id="-343201" user="overview-creator" visible="true" lat="-0.00156" lon="0.00506"/>
@@ -8149,10 +8438,10 @@
     <nd ref="-343204"/>
     <nd ref="-343201"/>
+    <tag k="natural" v="mud"/>
+    <tag k="name" v="mud"/>
+  </way>
+  <node id="-343400" user="overview-creator" visible="true" lat="-0.00170" lon="0.00510">
     <tag k="natural" v="beach"/>
     <tag k="name" v="beach"/>
-  </way>
-  <node id="-343400" user="overview-creator" visible="true" lat="-0.00170" lon="0.00510">
-    <tag k="natural" v="bay"/>
-    <tag k="name" v="bay"/>
   </node>
   <node id="-343401" user="overview-creator" visible="true" lat="-0.00166" lon="0.00506"/>
@@ -8166,10 +8455,10 @@
     <nd ref="-343404"/>
     <nd ref="-343401"/>
+    <tag k="natural" v="beach"/>
+    <tag k="name" v="beach"/>
+  </way>
+  <node id="-343600" user="overview-creator" visible="true" lat="-0.00180" lon="0.00510">
     <tag k="natural" v="bay"/>
     <tag k="name" v="bay"/>
-  </way>
-  <node id="-343600" user="overview-creator" visible="true" lat="-0.00180" lon="0.00510">
-    <tag k="natural" v="land"/>
-    <tag k="name" v="land"/>
   </node>
   <node id="-343601" user="overview-creator" visible="true" lat="-0.00176" lon="0.00506"/>
@@ -8183,10 +8472,10 @@
     <nd ref="-343604"/>
     <nd ref="-343601"/>
+    <tag k="natural" v="bay"/>
+    <tag k="name" v="bay"/>
+  </way>
+  <node id="-343800" user="overview-creator" visible="true" lat="-0.00190" lon="0.00510">
     <tag k="natural" v="land"/>
     <tag k="name" v="land"/>
-  </way>
-  <node id="-343800" user="overview-creator" visible="true" lat="-0.00190" lon="0.00510">
-    <tag k="natural" v="cave_entrance"/>
-    <tag k="name" v="cave_entrance"/>
   </node>
   <node id="-343801" user="overview-creator" visible="true" lat="-0.00186" lon="0.00506"/>
@@ -8200,10 +8489,10 @@
     <nd ref="-343804"/>
     <nd ref="-343801"/>
+    <tag k="natural" v="land"/>
+    <tag k="name" v="land"/>
+  </way>
+  <node id="-344000" user="overview-creator" visible="true" lat="-0.00200" lon="0.00510">
     <tag k="natural" v="cave_entrance"/>
     <tag k="name" v="cave_entrance"/>
-  </way>
-  <node id="-344000" user="overview-creator" visible="true" lat="-0.00200" lon="0.00510">
-    <tag k="natural" v="tree"/>
-    <tag k="name" v="tree"/>
   </node>
   <node id="-344001" user="overview-creator" visible="true" lat="-0.00196" lon="0.00506"/>
@@ -8217,4 +8506,21 @@
     <nd ref="-344004"/>
     <nd ref="-344001"/>
+    <tag k="natural" v="cave_entrance"/>
+    <tag k="name" v="cave_entrance"/>
+  </way>
+  <node id="-344200" user="overview-creator" visible="true" lat="-0.00210" lon="0.00510">
+    <tag k="natural" v="tree"/>
+    <tag k="name" v="tree"/>
+  </node>
+  <node id="-344201" user="overview-creator" visible="true" lat="-0.00206" lon="0.00506"/>
+  <node id="-344202" user="overview-creator" visible="true" lat="-0.00206" lon="0.00534"/>
+  <node id="-344203" user="overview-creator" visible="true" lat="-0.00214" lon="0.00534"/>
+  <node id="-344204" user="overview-creator" visible="true" lat="-0.00214" lon="0.00506"/>
+  <way id="-344204" user="overview-creator" visible="true">
+    <nd ref="-344201"/>
+    <nd ref="-344202"/>
+    <nd ref="-344203"/>
+    <nd ref="-344204"/>
+    <nd ref="-344201"/>
     <tag k="natural" v="tree"/>
     <tag k="name" v="tree"/>
Index: /trunk/styles/standard/overview.xsl
===================================================================
--- /trunk/styles/standard/overview.xsl	(revision 1539)
+++ /trunk/styles/standard/overview.xsl	(revision 1540)
@@ -352,5 +352,5 @@
     </xsl:call-template>
     <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'surface'"/>
+		<xsl:with-param name="key" select="'direction'"/>
 		<xsl:with-param name="column" select="2"/>
 		<xsl:with-param name="row" select="15"/>
@@ -575,5 +575,5 @@
 		<xsl:with-param name="key" select="'power'"/>
 		<xsl:with-param name="column" select="11"/>
-		<xsl:with-param name="row" select="25"/>
+		<xsl:with-param name="row" select="23"/>
     </xsl:call-template>
     <xsl:call-template name="topic">
@@ -582,9 +582,4 @@
 		<xsl:with-param name="row" select="30"/>
     </xsl:call-template>	
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'military'"/>
-		<xsl:with-param name="column" select="11"/>
-		<xsl:with-param name="row" select="36"/>
-    </xsl:call-template>
 	
     <xsl:call-template name="topic">
@@ -598,10 +593,14 @@
 		<xsl:with-param name="column" select="13"/>
 		<xsl:with-param name="row" select="1"/>
-    </xsl:call-template>
-		
+    </xsl:call-template>		
     <xsl:call-template name="topic">
 		<xsl:with-param name="key" select="'information'"/>
 		<xsl:with-param name="column" select="13"/>
 		<xsl:with-param name="row" select="19"/>
+    </xsl:call-template>
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'military'"/>
+		<xsl:with-param name="column" select="13"/>
+		<xsl:with-param name="row" select="36"/>
     </xsl:call-template>