Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 9551)
+++ trunk/data/validator/deprecated.mapcss	(revision 9552)
@@ -176,5 +176,5 @@
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "barrier=chain";
-  suggestAlternative: "fence_type=chain_link";
+  suggestAlternative: "barrier=fence + fence_type=chain_link";
 }
 
Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 9551)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 9552)
@@ -811,5 +811,5 @@
 
         String directionDefault = "oneway? | (aerialway=* -aerialway=station) | "+
-                "waterway=stream | waterway=river | waterway=ditch | waterway=wadi | waterway=drain | "+
+                "waterway=stream | waterway=river | waterway=ditch | waterway=drain | "+
                 "\"piste:type\"=downhill | \"piste:type\"=sled | man_made=\"piste:halfpipe\" | "+
                 "junction=roundabout | (highway=motorway & -oneway=no & -oneway=reversible) | "+