Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 713)
+++ trunk/styles/standard/elemstyles.xml	(revision 714)
@@ -478,5 +478,5 @@
 	<rule>
 		<condition k="highway" v="construction" />
-		<line width="2" realwidth="5" colour="#FFFF00"/>
+		<line width="2" realwidth="5" colour="#FFFF00" dashed="true"/>
 		<icon src="misc/construction.png" />
         <scale_min>1</scale_min>
@@ -1324,4 +1324,20 @@
 
 	<rule>
+		<condition k="amenity" v="bar" />
+		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#ecba52"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="amenity" v="ice_cream" />
+		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#ecba52"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
 		<condition k="amenity" v="parking" />
 		<icon annotate="true" src="vehicle/parking.png" />
@@ -1364,4 +1380,12 @@
 
 	<rule>
+		<condition k="amenity" v="car_wash" />
+		<area colour="#f7efb7"/>
+		<icon annotate="true" src="misc/proposed.png" />
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
 		<condition k="amenity" v="taxi" />
 		<icon annotate="true" src="transport/taxi.png" />
@@ -1427,4 +1451,12 @@
 	</rule>
 	  	
+	<rule>
+		<condition k="amenity" v="fountain"/>
+		<icon annotate="true" src="misc/landmark/spring.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
 	<!--the religion rules must be placed before the place_of_worship rule! -->
 	<rule>
@@ -1515,4 +1547,12 @@
 
 	<rule>
+		<condition k="amenity" v="crematorium" />
+		<area colour="#f7efb7"/>
+		<icon annotate="true" src="misc/proposed.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="amenity" v="post_office" />
 		<icon annotate="true" src="public/post_office.png" />
@@ -1549,4 +1589,12 @@
 		<condition k="amenity" v="college" />
 		<icon annotate="true" src="education/college.png" />
+		<area colour="#f7efb7"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="amenity" v="kindergarten" />
+		<icon annotate="true" src="misc/proposed.png" />
 		<area colour="#f7efb7"/>
         <scale_min>1</scale_min>
@@ -1571,4 +1619,28 @@
 
 	<rule>
+		<condition k="amenity" v="sheltered_housing" />
+        <area colour="#eeeeee" />
+		<icon annotate="true" src="misc/proposed.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="amenity" v="nursery" />
+        <area colour="#eeeeee" />
+		<icon annotate="true" src="misc/proposed.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="amenity" v="dentist" />
+        <area colour="#eeeeee" />
+		<icon annotate="true" src="misc/proposed.png" />
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
 		<condition k="amenity" v="library" />
 		<area colour="#f7efb7"/>
@@ -1667,11 +1739,19 @@
 
 	<rule>
-		<condition k="amenity" v="fountain"/>
-		<icon annotate="true" src="misc/landmark/spring.png" />
-		<area colour="#00005f"/>
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
+		<condition k="amenity" v="park_bench" />
+		<area colour="#f7efb7"/>
+		<icon annotate="true" src="misc/proposed.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="amenity" v="shelter" />
+		<area colour="#f7efb7"/>
+		<icon annotate="true" src="misc/proposed.png" />
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	
 <!--shop tags -->
 
@@ -2066,5 +2146,5 @@
 	<rule>
 		<condition k="landuse" v="construction"/>
-		<area colour="#FFFF00"/>
+		<area colour="#FFFF00" dashed="true"/>
 		<icon src="misc/construction.png" />
         <scale_min>1</scale_min>
@@ -2803,84 +2883,4 @@
 
 <!--"work in progress" tags -->
-	<rule>
-		<condition k="amenity" v="bar" />
-		<icon annotate="true" src="misc/proposed.png" />
-		<area colour="#ecba52"/>
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-	
-	<rule>
-		<condition k="amenity" v="crematorium" />
-		<area colour="#f7efb7"/>
-		<icon annotate="true" src="misc/proposed.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="amenity" v="kindergarten" />
-		<icon annotate="true" src="misc/proposed.png" />
-		<area colour="#f7efb7"/>
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="amenity" v="park_bench" />
-		<area colour="#f7efb7"/>
-		<icon annotate="true" src="misc/proposed.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="amenity" v="sheltered_housing" />
-        <area colour="#eeeeee" />
-		<icon annotate="true" src="misc/proposed.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="amenity" v="nursery" />
-        <area colour="#eeeeee" />
-		<icon annotate="true" src="misc/proposed.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="amenity" v="shelter" />
-		<area colour="#f7efb7"/>
-		<icon annotate="true" src="misc/proposed.png" />
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-	
-	<rule>
-		<condition k="amenity" v="car_wash" />
-		<area colour="#f7efb7"/>
-		<icon annotate="true" src="misc/proposed.png" />
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-	
-	<rule>
-		<condition k="amenity" v="dentist" />
-        <area colour="#eeeeee" />
-		<icon annotate="true" src="misc/proposed.png" />
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-	
-	<rule>
-		<condition k="amenity" v="ice_cream" />
-		<icon annotate="true" src="misc/proposed.png" />
-		<area colour="#ecba52"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-	
 	<rule>
 		<condition k="shop" v="beverages" />
Index: trunk/styles/standard/overview.xsl
===================================================================
--- trunk/styles/standard/overview.xsl	(revision 713)
+++ trunk/styles/standard/overview.xsl	(revision 714)
@@ -209,5 +209,5 @@
 
 		<xsl:choose>
-			<xsl:when test="$ypos &lt; 43">
+			<xsl:when test="$ypos &lt; 41">
 				<!-- recursive call - increasing index and output counters -->
 			    <xsl:call-template name="posed_rules">
@@ -224,5 +224,5 @@
 					<xsl:with-param name="index" select="$index + 1"/>
 					<xsl:with-param name="xpos" select="$xpos + 1"/>
-					<xsl:with-param name="ypos" select="35"/>
+					<xsl:with-param name="ypos" select="30"/>
 			    </xsl:call-template>
 			</xsl:otherwise>
@@ -342,143 +342,142 @@
 		<xsl:with-param name="row" select="30"/>
     </xsl:call-template>
+	
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'access'"/>
+		<xsl:with-param name="column" select="3"/>
+		<xsl:with-param name="row" select="1"/>
+    </xsl:call-template>
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'bicycle'"/>
+		<xsl:with-param name="column" select="3"/>
+		<xsl:with-param name="row" select="3"/>
+    </xsl:call-template>
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'foot'"/>
+		<xsl:with-param name="column" select="3"/>
+		<xsl:with-param name="row" select="6"/>
+    </xsl:call-template>
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'goods'"/>
+		<xsl:with-param name="column" select="3"/>
+		<xsl:with-param name="row" select="10"/>
+    </xsl:call-template>
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'hgv'"/>
+		<xsl:with-param name="column" select="3"/>
+		<xsl:with-param name="row" select="12"/>
+    </xsl:call-template>
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'horse'"/>
+		<xsl:with-param name="column" select="3"/>
+		<xsl:with-param name="row" select="14"/>
+    </xsl:call-template>
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'motorcycle'"/>
+		<xsl:with-param name="column" select="3"/>
+		<xsl:with-param name="row" select="17"/>
+    </xsl:call-template>
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'motorcar'"/>
+		<xsl:with-param name="column" select="3"/>
+		<xsl:with-param name="row" select="19"/>
+    </xsl:call-template>
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'psv'"/>
+		<xsl:with-param name="column" select="3"/>
+		<xsl:with-param name="row" select="21"/>
+    </xsl:call-template>
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'motorboat'"/>
+		<xsl:with-param name="column" select="3"/>
+		<xsl:with-param name="row" select="23"/>
+    </xsl:call-template>
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'boat'"/>
+		<xsl:with-param name="column" select="3"/>
+		<xsl:with-param name="row" select="25"/>
+    </xsl:call-template>
+	
+	<xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'noexit'"/>
+		<xsl:with-param name="column" select="4"/>
+		<xsl:with-param name="row" select="1"/>
+    </xsl:call-template>
+	<xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'maxweight'"/>
+		<xsl:with-param name="column" select="4"/>
+		<xsl:with-param name="row" select="3"/>
+    </xsl:call-template>
+	<xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'maxheight'"/>
+		<xsl:with-param name="column" select="4"/>
+		<xsl:with-param name="row" select="5"/>
+    </xsl:call-template>
+	<xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'maxwidth'"/>
+		<xsl:with-param name="column" select="4"/>
+		<xsl:with-param name="row" select="7"/>
+    </xsl:call-template>
+	<xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'maxlength'"/>
+		<xsl:with-param name="column" select="4"/>
+		<xsl:with-param name="row" select="9"/>
+    </xsl:call-template>
+	<xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'maxspeed'"/>
+		<xsl:with-param name="column" select="4"/>
+		<xsl:with-param name="row" select="11"/>
+    </xsl:call-template>
+	<xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'minspeed'"/>
+		<xsl:with-param name="column" select="4"/>
+		<xsl:with-param name="row" select="13"/>
+    </xsl:call-template>
+	<xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'maxstay'"/>
+		<xsl:with-param name="column" select="4"/>
+		<xsl:with-param name="row" select="15"/>
+    </xsl:call-template>
+	<xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'toll'"/>
+		<xsl:with-param name="column" select="4"/>
+		<xsl:with-param name="row" select="17"/>
+    </xsl:call-template>
+		
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'railway'"/>
+		<xsl:with-param name="column" select="5"/>
+		<xsl:with-param name="row" select="1"/>
+    </xsl:call-template>
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'service'"/>
+		<xsl:with-param name="column" select="5"/>
+		<xsl:with-param name="row" select="21"/>
+    </xsl:call-template>
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'waterway'"/>
+		<xsl:with-param name="column" select="5"/>
+		<xsl:with-param name="row" select="26"/>
+    </xsl:call-template>
+	
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'aeroway'"/>
+		<xsl:with-param name="column" select="6"/>
+		<xsl:with-param name="row" select="1"/>
+    </xsl:call-template>
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'aerialway'"/>
+		<xsl:with-param name="column" select="6"/>
+		<xsl:with-param name="row" select="10"/>
+    </xsl:call-template>
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'piste:difficulty'"/>
+		<xsl:with-param name="column" select="6"/>
+		<xsl:with-param name="row" select="20"/>
+    </xsl:call-template>
     <xsl:call-template name="topic">
 		<xsl:with-param name="key" select="'route'"/>
-		<xsl:with-param name="column" select="2"/>
-		<xsl:with-param name="row" select="35"/>
-    </xsl:call-template>
-	
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'access'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'bicycle'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="3"/>
-    </xsl:call-template>
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'foot'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="5"/>
-    </xsl:call-template>
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'goods'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="7"/>
-    </xsl:call-template>
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'hgv'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="9"/>
-    </xsl:call-template>
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'horse'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="11"/>
-    </xsl:call-template>
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'motorcycle'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="13"/>
-    </xsl:call-template>
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'motorcar'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="15"/>
-    </xsl:call-template>
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'psv'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="17"/>
-    </xsl:call-template>
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'motorboat'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="19"/>
-    </xsl:call-template>
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'boat'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="21"/>
-    </xsl:call-template>
-	<xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'noexit'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="23"/>
-    </xsl:call-template>
-	<xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'maxweight'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="25"/>
-    </xsl:call-template>
-	<xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'maxheight'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="27"/>
-    </xsl:call-template>
-	<xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'maxwidth'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="29"/>
-    </xsl:call-template>
-	<xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'maxlength'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="31"/>
-    </xsl:call-template>
-	<xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'maxspeed'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="33"/>
-    </xsl:call-template>
-	<xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'minspeed'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="35"/>
-    </xsl:call-template>
-	<xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'maxstay'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="37"/>
-    </xsl:call-template>
-	<xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'toll'"/>
-		<xsl:with-param name="column" select="3"/>
-		<xsl:with-param name="row" select="39"/>
-    </xsl:call-template>
-		
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'railway'"/>
-		<xsl:with-param name="column" select="4"/>
-		<xsl:with-param name="row" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'service'"/>
-		<xsl:with-param name="column" select="4"/>
-		<xsl:with-param name="row" select="21"/>
-    </xsl:call-template>
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'waterway'"/>
-		<xsl:with-param name="column" select="4"/>
-		<xsl:with-param name="row" select="26"/>
-    </xsl:call-template>
-	
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'aeroway'"/>
-		<xsl:with-param name="column" select="5"/>
-		<xsl:with-param name="row" select="1"/>
-    </xsl:call-template>
-	
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'aerialway'"/>
-		<xsl:with-param name="column" select="5"/>
-		<xsl:with-param name="row" select="25"/>
-    </xsl:call-template>
-	
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'piste:difficulty'"/>
-		<xsl:with-param name="column" select="5"/>
-		<xsl:with-param name="row" select="35"/>
+		<xsl:with-param name="column" select="6"/>
+		<xsl:with-param name="row" select="30"/>
     </xsl:call-template>
 	
@@ -487,5 +486,5 @@
     <xsl:call-template name="topic">
 		<xsl:with-param name="key" select="'amenity'"/>
-		<xsl:with-param name="column" select="7"/>
+		<xsl:with-param name="column" select="8"/>
 		<xsl:with-param name="row" select="1"/>
     </xsl:call-template>
@@ -493,5 +492,5 @@
     <xsl:call-template name="topic">
 		<xsl:with-param name="key" select="'leisure'"/>
-		<xsl:with-param name="column" select="8"/>
+		<xsl:with-param name="column" select="9"/>
 		<xsl:with-param name="row" select="1"/>
     </xsl:call-template>
@@ -499,5 +498,5 @@
     <xsl:call-template name="topic">
 		<xsl:with-param name="key" select="'tourism'"/>
-		<xsl:with-param name="column" select="9"/>
+		<xsl:with-param name="column" select="10"/>
 		<xsl:with-param name="row" select="1"/>
     </xsl:call-template>
@@ -505,32 +504,34 @@
     <xsl:call-template name="topic">
 		<xsl:with-param name="key" select="'historic'"/>
-		<xsl:with-param name="column" select="9"/>
-		<xsl:with-param name="row" select="25"/>
-    </xsl:call-template>
-	
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'man_made'"/>
-		<xsl:with-param name="column" select="10"/>
-		<xsl:with-param name="row" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'power'"/>
 		<xsl:with-param name="column" select="10"/>
 		<xsl:with-param name="row" select="25"/>
     </xsl:call-template>
+	
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'man_made'"/>
+		<xsl:with-param name="column" select="11"/>
+		<xsl:with-param name="row" select="1"/>
+    </xsl:call-template>
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'power'"/>
+		<xsl:with-param name="column" select="11"/>
+		<xsl:with-param name="row" select="25"/>
+    </xsl:call-template>
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'power_source'"/>
+		<xsl:with-param name="column" select="11"/>
+		<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="10"/>
-		<xsl:with-param name="row" select="35"/>
+		<xsl:with-param name="column" select="11"/>
+		<xsl:with-param name="row" select="36"/>
     </xsl:call-template>
 	
     <xsl:call-template name="topic">
 		<xsl:with-param name="key" select="'shop'"/>
-		<xsl:with-param name="column" select="11"/>
-		<xsl:with-param name="row" select="1"/>
-    </xsl:call-template>
-	
-
-
+		<xsl:with-param name="column" select="12"/>
+		<xsl:with-param name="row" select="1"/>
+    </xsl:call-template>
 	
     <xsl:call-template name="topic">
@@ -545,39 +546,33 @@
 		<xsl:with-param name="row" select="1"/>
     </xsl:call-template>
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'power_source'"/>
-		<xsl:with-param name="column" select="14"/>
-		<xsl:with-param name="row" select="25"/>
-    </xsl:call-template>	
+	
+
+
+	
+    <xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'landuse'"/>
+		<xsl:with-param name="column" select="16"/>
+		<xsl:with-param name="row" select="1"/>
+    </xsl:call-template>
     <xsl:call-template name="topic">
 		<xsl:with-param name="key" select="'building'"/>
-		<xsl:with-param name="column" select="14"/>
+		<xsl:with-param name="column" select="16"/>
 		<xsl:with-param name="row" select="35"/>
     </xsl:call-template>	
 	
-
-
-	
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'landuse'"/>
-		<xsl:with-param name="column" select="16"/>
-		<xsl:with-param name="row" select="1"/>
-    </xsl:call-template>
-	
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'natural'"/>
-		<xsl:with-param name="column" select="16"/>
-		<xsl:with-param name="row" select="25"/>
-    </xsl:call-template>
-	
     <xsl:call-template name="topic">
 		<xsl:with-param name="key" select="'place'"/>
 		<xsl:with-param name="column" select="17"/>
-		<xsl:with-param name="row" select="1"/>
-    </xsl:call-template>
-	    <xsl:call-template name="topic">
+		<xsl:with-param name="row" select="23"/>
+    </xsl:call-template>
+	<xsl:call-template name="topic">
+		<xsl:with-param name="key" select="'natural'"/>
+		<xsl:with-param name="column" select="17"/>
+		<xsl:with-param name="row" select="1"/>
+    </xsl:call-template>
+	<xsl:call-template name="topic">
 		<xsl:with-param name="key" select="'boundary'"/>
 		<xsl:with-param name="column" select="17"/>
-		<xsl:with-param name="row" select="25"/>
+		<xsl:with-param name="row" select="36"/>
     </xsl:call-template>