Index: trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java	(revision 946)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java	(revision 947)
@@ -73,5 +73,5 @@
 						ret = style;
 				}
-				if((style = icons.get("n" + key + "=" + OsmUtils.getNamedOsmBoolean(val))) != null)
+				if((style = icons.get("b" + key + "=" + OsmUtils.getNamedOsmBoolean(val))) != null)
 				{
 					if(ret == null || style.priority > ret.priority)
Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 946)
+++ trunk/styles/standard/elemstyles.xml	(revision 947)
@@ -64,5 +64,5 @@
 	<rule>
 		<condition k="bridge" b="no"/>
-		<line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000"/>
+		<line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000" priority="-50000"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
Index: trunk/styles/standard/overview.osm
===================================================================
--- trunk/styles/standard/overview.osm	(revision 946)
+++ trunk/styles/standard/overview.osm	(revision 947)
@@ -907,6 +907,6 @@
     <nd ref="-44204"/>
     <nd ref="-44201"/>
-    <tag k="bridge" v=""/>
-    <tag k="name" v=""/>
+    <tag k="bridge" v="yes"/>
+    <tag k="name" v="yes"/>
   </way>
   <node id="-44400" user="overview-creator" visible="true" lat="-0.00220" lon="0.00060">
@@ -924,6 +924,6 @@
     <nd ref="-44404"/>
     <nd ref="-44401"/>
-    <tag k="bridge" v=""/>
-    <tag k="name" v=""/>
+    <tag k="bridge" v="no"/>
+    <tag k="name" v="no"/>
   </way>
   <node id="-44600" user="overview-creator" visible="true" lat="-0.00230" lon="0.00060">
@@ -996,6 +996,6 @@
     <nd ref="-46204"/>
     <nd ref="-46201"/>
-    <tag k="tunnel" v=""/>
-    <tag k="name" v=""/>
+    <tag k="tunnel" v="yes"/>
+    <tag k="name" v="yes"/>
   </way>
   <node id="-46400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00060">
@@ -1013,6 +1013,6 @@
     <nd ref="-46404"/>
     <nd ref="-46401"/>
-    <tag k="tunnel" v=""/>
-    <tag k="name" v=""/>
+    <tag k="tunnel" v="no"/>
+    <tag k="name" v="no"/>
   </way>
   <node id="-47000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00060">
@@ -1588,5 +1588,8 @@
     <tag k="name" v="oneway"/>
   </node>
-  <node id="-84000" user="overview-creator" visible="true" lat="-0.00200" lon="0.00120"/>
+  <node id="-84000" user="overview-creator" visible="true" lat="-0.00200" lon="0.00120">
+    <tag k="oneway" v="any"/>
+    <tag k="name" v="any"/>
+  </node>
   <node id="-84001" user="overview-creator" visible="true" lat="-0.00196" lon="0.00116"/>
   <node id="-84002" user="overview-creator" visible="true" lat="-0.00196" lon="0.00144"/>
@@ -1599,6 +1602,6 @@
     <nd ref="-84004"/>
     <nd ref="-84001"/>
-    <tag k="oneway" v=""/>
-    <tag k="name" v=""/>
+    <tag k="oneway" v="any"/>
+    <tag k="name" v="any"/>
   </way>
   <node id="-100200" user="overview-creator" visible="true" lat="-0.00010" lon="0.00150">
@@ -6490,6 +6493,6 @@
   </way>
   <node id="-322000" user="overview-creator" visible="true" lat="-0.00100" lon="0.00480">
-    <tag k="landuse" v="residential"/>
-    <tag k="name" v="residential"/>
+    <tag k="landuse" v="grass"/>
+    <tag k="name" v="grass"/>
   </node>
   <node id="-322001" user="overview-creator" visible="true" lat="-0.00096" lon="0.00476"/>
@@ -6503,10 +6506,10 @@
     <nd ref="-322004"/>
     <nd ref="-322001"/>
+    <tag k="landuse" v="grass"/>
+    <tag k="name" v="grass"/>
+  </way>
+  <node id="-322200" user="overview-creator" visible="true" lat="-0.00110" lon="0.00480">
     <tag k="landuse" v="residential"/>
     <tag k="name" v="residential"/>
-  </way>
-  <node id="-322200" user="overview-creator" visible="true" lat="-0.00110" lon="0.00480">
-    <tag k="landuse" v="farmyard"/>
-    <tag k="name" v="farmyard"/>
   </node>
   <node id="-322201" user="overview-creator" visible="true" lat="-0.00106" lon="0.00476"/>
@@ -6520,10 +6523,10 @@
     <nd ref="-322204"/>
     <nd ref="-322201"/>
+    <tag k="landuse" v="residential"/>
+    <tag k="name" v="residential"/>
+  </way>
+  <node id="-322400" user="overview-creator" visible="true" lat="-0.00120" lon="0.00480">
     <tag k="landuse" v="farmyard"/>
     <tag k="name" v="farmyard"/>
-  </way>
-  <node id="-322400" user="overview-creator" visible="true" lat="-0.00120" lon="0.00480">
-    <tag k="landuse" v="retail"/>
-    <tag k="name" v="retail"/>
   </node>
   <node id="-322401" user="overview-creator" visible="true" lat="-0.00116" lon="0.00476"/>
@@ -6537,10 +6540,10 @@
     <nd ref="-322404"/>
     <nd ref="-322401"/>
+    <tag k="landuse" v="farmyard"/>
+    <tag k="name" v="farmyard"/>
+  </way>
+  <node id="-322600" user="overview-creator" visible="true" lat="-0.00130" lon="0.00480">
     <tag k="landuse" v="retail"/>
     <tag k="name" v="retail"/>
-  </way>
-  <node id="-322600" user="overview-creator" visible="true" lat="-0.00130" lon="0.00480">
-    <tag k="landuse" v="commercial"/>
-    <tag k="name" v="commercial"/>
   </node>
   <node id="-322601" user="overview-creator" visible="true" lat="-0.00126" lon="0.00476"/>
@@ -6554,10 +6557,10 @@
     <nd ref="-322604"/>
     <nd ref="-322601"/>
+    <tag k="landuse" v="retail"/>
+    <tag k="name" v="retail"/>
+  </way>
+  <node id="-322800" user="overview-creator" visible="true" lat="-0.00140" lon="0.00480">
     <tag k="landuse" v="commercial"/>
     <tag k="name" v="commercial"/>
-  </way>
-  <node id="-322800" user="overview-creator" visible="true" lat="-0.00140" lon="0.00480">
-    <tag k="landuse" v="industrial"/>
-    <tag k="name" v="industrial"/>
   </node>
   <node id="-322801" user="overview-creator" visible="true" lat="-0.00136" lon="0.00476"/>
@@ -6571,10 +6574,10 @@
     <nd ref="-322804"/>
     <nd ref="-322801"/>
+    <tag k="landuse" v="commercial"/>
+    <tag k="name" v="commercial"/>
+  </way>
+  <node id="-323000" user="overview-creator" visible="true" lat="-0.00150" lon="0.00480">
     <tag k="landuse" v="industrial"/>
     <tag k="name" v="industrial"/>
-  </way>
-  <node id="-323000" user="overview-creator" visible="true" lat="-0.00150" lon="0.00480">
-    <tag k="landuse" v="brownfield"/>
-    <tag k="name" v="brownfield"/>
   </node>
   <node id="-323001" user="overview-creator" visible="true" lat="-0.00146" lon="0.00476"/>
@@ -6588,10 +6591,10 @@
     <nd ref="-323004"/>
     <nd ref="-323001"/>
+    <tag k="landuse" v="industrial"/>
+    <tag k="name" v="industrial"/>
+  </way>
+  <node id="-323200" user="overview-creator" visible="true" lat="-0.00160" lon="0.00480">
     <tag k="landuse" v="brownfield"/>
     <tag k="name" v="brownfield"/>
-  </way>
-  <node id="-323200" user="overview-creator" visible="true" lat="-0.00160" lon="0.00480">
-    <tag k="landuse" v="greenfield"/>
-    <tag k="name" v="greenfield"/>
   </node>
   <node id="-323201" user="overview-creator" visible="true" lat="-0.00156" lon="0.00476"/>
@@ -6605,10 +6608,10 @@
     <nd ref="-323204"/>
     <nd ref="-323201"/>
+    <tag k="landuse" v="brownfield"/>
+    <tag k="name" v="brownfield"/>
+  </way>
+  <node id="-323400" user="overview-creator" visible="true" lat="-0.00170" lon="0.00480">
     <tag k="landuse" v="greenfield"/>
     <tag k="name" v="greenfield"/>
-  </way>
-  <node id="-323400" user="overview-creator" visible="true" lat="-0.00170" lon="0.00480">
-    <tag k="landuse" v="railway"/>
-    <tag k="name" v="railway"/>
   </node>
   <node id="-323401" user="overview-creator" visible="true" lat="-0.00166" lon="0.00476"/>
@@ -6622,10 +6625,10 @@
     <nd ref="-323404"/>
     <nd ref="-323401"/>
+    <tag k="landuse" v="greenfield"/>
+    <tag k="name" v="greenfield"/>
+  </way>
+  <node id="-323600" user="overview-creator" visible="true" lat="-0.00180" lon="0.00480">
     <tag k="landuse" v="railway"/>
     <tag k="name" v="railway"/>
-  </way>
-  <node id="-323600" user="overview-creator" visible="true" lat="-0.00180" lon="0.00480">
-    <tag k="landuse" v="construction"/>
-    <tag k="name" v="construction"/>
   </node>
   <node id="-323601" user="overview-creator" visible="true" lat="-0.00176" lon="0.00476"/>
@@ -6639,10 +6642,10 @@
     <nd ref="-323604"/>
     <nd ref="-323601"/>
+    <tag k="landuse" v="railway"/>
+    <tag k="name" v="railway"/>
+  </way>
+  <node id="-323800" user="overview-creator" visible="true" lat="-0.00190" lon="0.00480">
     <tag k="landuse" v="construction"/>
     <tag k="name" v="construction"/>
-  </way>
-  <node id="-323800" user="overview-creator" visible="true" lat="-0.00190" lon="0.00480">
-    <tag k="landuse" v="military"/>
-    <tag k="name" v="military"/>
   </node>
   <node id="-323801" user="overview-creator" visible="true" lat="-0.00186" lon="0.00476"/>
@@ -6656,10 +6659,10 @@
     <nd ref="-323804"/>
     <nd ref="-323801"/>
+    <tag k="landuse" v="construction"/>
+    <tag k="name" v="construction"/>
+  </way>
+  <node id="-324000" user="overview-creator" visible="true" lat="-0.00200" lon="0.00480">
     <tag k="landuse" v="military"/>
     <tag k="name" v="military"/>
-  </way>
-  <node id="-324000" user="overview-creator" visible="true" lat="-0.00200" lon="0.00480">
-    <tag k="landuse" v="cemetery"/>
-    <tag k="name" v="cemetery"/>
   </node>
   <node id="-324001" user="overview-creator" visible="true" lat="-0.00196" lon="0.00476"/>
@@ -6673,10 +6676,10 @@
     <nd ref="-324004"/>
     <nd ref="-324001"/>
+    <tag k="landuse" v="military"/>
+    <tag k="name" v="military"/>
+  </way>
+  <node id="-324200" user="overview-creator" visible="true" lat="-0.00210" lon="0.00480">
     <tag k="landuse" v="cemetery"/>
     <tag k="name" v="cemetery"/>
-  </way>
-  <node id="-324200" user="overview-creator" visible="true" lat="-0.00210" lon="0.00480">
-    <tag k="landuse" v="village_green"/>
-    <tag k="name" v="village_green"/>
   </node>
   <node id="-324201" user="overview-creator" visible="true" lat="-0.00206" lon="0.00476"/>
@@ -6690,10 +6693,10 @@
     <nd ref="-324204"/>
     <nd ref="-324201"/>
+    <tag k="landuse" v="cemetery"/>
+    <tag k="name" v="cemetery"/>
+  </way>
+  <node id="-324400" user="overview-creator" visible="true" lat="-0.00220" lon="0.00480">
     <tag k="landuse" v="village_green"/>
     <tag k="name" v="village_green"/>
-  </way>
-  <node id="-324400" user="overview-creator" visible="true" lat="-0.00220" lon="0.00480">
-    <tag k="landuse" v="recreation_ground"/>
-    <tag k="name" v="recreation_ground"/>
   </node>
   <node id="-324401" user="overview-creator" visible="true" lat="-0.00216" lon="0.00476"/>
@@ -6707,4 +6710,21 @@
     <nd ref="-324404"/>
     <nd ref="-324401"/>
+    <tag k="landuse" v="village_green"/>
+    <tag k="name" v="village_green"/>
+  </way>
+  <node id="-324600" user="overview-creator" visible="true" lat="-0.00230" lon="0.00480">
+    <tag k="landuse" v="recreation_ground"/>
+    <tag k="name" v="recreation_ground"/>
+  </node>
+  <node id="-324601" user="overview-creator" visible="true" lat="-0.00226" lon="0.00476"/>
+  <node id="-324602" user="overview-creator" visible="true" lat="-0.00226" lon="0.00504"/>
+  <node id="-324603" user="overview-creator" visible="true" lat="-0.00234" lon="0.00504"/>
+  <node id="-324604" user="overview-creator" visible="true" lat="-0.00234" lon="0.00476"/>
+  <way id="-324604" user="overview-creator" visible="true">
+    <nd ref="-324601"/>
+    <nd ref="-324602"/>
+    <nd ref="-324603"/>
+    <nd ref="-324604"/>
+    <nd ref="-324601"/>
     <tag k="landuse" v="recreation_ground"/>
     <tag k="name" v="recreation_ground"/>
@@ -6728,6 +6748,6 @@
     <nd ref="-327204"/>
     <nd ref="-327201"/>
-    <tag k="building" v=""/>
-    <tag k="name" v=""/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="yes"/>
   </way>
   <node id="-327400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00480">
Index: trunk/styles/standard/overview.xsl
===================================================================
--- trunk/styles/standard/overview.xsl	(revision 946)
+++ trunk/styles/standard/overview.xsl	(revision 947)
@@ -117,4 +117,14 @@
 				<xsl:attribute name="k">name</xsl:attribute>
 				<xsl:attribute name="v"><xsl:value-of select = "rule[$index]/condition/@b" /></xsl:attribute>
+			</xsl:element>
+		</xsl:if>
+		<xsl:if test="not(rule[$index]/condition/@b) and not(rule[$index]/condition/@v)">
+			<xsl:element name="tag">
+				<xsl:attribute name="k"><xsl:value-of select = "rule[$index]/condition/@k" /></xsl:attribute>
+				<xsl:attribute name="v">any</xsl:attribute>
+			</xsl:element>
+			<xsl:element name="tag">
+				<xsl:attribute name="k">name</xsl:attribute>
+				<xsl:attribute name="v">any</xsl:attribute>
 			</xsl:element>
 		</xsl:if>
@@ -194,12 +204,34 @@
 		</xsl:element>
 		
-		<xsl:element name="tag">
-			<xsl:attribute name="k"><xsl:value-of select = "rule[$index]/condition/@k" /></xsl:attribute>
-			<xsl:attribute name="v"><xsl:value-of select = "rule[$index]/condition/@v" /></xsl:attribute>
-		</xsl:element>
-		<xsl:element name="tag">
-			<xsl:attribute name="k">name</xsl:attribute>
-			<xsl:attribute name="v"><xsl:value-of select = "rule[$index]/condition/@v" /></xsl:attribute>
-		</xsl:element>
+		<xsl:if test="rule[$index]/condition/@v">
+			<xsl:element name="tag">
+				<xsl:attribute name="k"><xsl:value-of select = "rule[$index]/condition/@k" /></xsl:attribute>
+				<xsl:attribute name="v"><xsl:value-of select = "rule[$index]/condition/@v" /></xsl:attribute>
+			</xsl:element>
+			<xsl:element name="tag">
+				<xsl:attribute name="k">name</xsl:attribute>
+				<xsl:attribute name="v"><xsl:value-of select = "rule[$index]/condition/@v" /></xsl:attribute>
+			</xsl:element>
+		</xsl:if>
+		<xsl:if test="rule[$index]/condition/@b">
+			<xsl:element name="tag">
+				<xsl:attribute name="k"><xsl:value-of select = "rule[$index]/condition/@k" /></xsl:attribute>
+				<xsl:attribute name="v"><xsl:value-of select = "rule[$index]/condition/@b" /></xsl:attribute>
+			</xsl:element>
+			<xsl:element name="tag">
+				<xsl:attribute name="k">name</xsl:attribute>
+				<xsl:attribute name="v"><xsl:value-of select = "rule[$index]/condition/@b" /></xsl:attribute>
+			</xsl:element>
+		</xsl:if>
+		<xsl:if test="not(rule[$index]/condition/@b) and not(rule[$index]/condition/@v)">
+			<xsl:element name="tag">
+				<xsl:attribute name="k"><xsl:value-of select = "rule[$index]/condition/@k" /></xsl:attribute>
+				<xsl:attribute name="v">any</xsl:attribute>
+			</xsl:element>
+			<xsl:element name="tag">
+				<xsl:attribute name="k">name</xsl:attribute>
+				<xsl:attribute name="v">any</xsl:attribute>
+			</xsl:element>
+		</xsl:if>
 	</xsl:element>
 </xsl:template>