Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 2882)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 2883)
@@ -554,5 +554,5 @@
             }
 
-            String defaultValue = "oneway=* | incline=* | incline_steep=* | aerialway=*";
+            String defaultValue = "oneway? | incline=* | incline_steep=* | aerialway=* | waterway=stream | waterway=river | waterway=canal | waterway=drain | \"piste:type\"=downhill | \"piste:type\"=sled | man_made=\"piste:halfpipe\" ";
             try {
                 directionKeys = SearchCompiler.compile(Main.pref.get("tags.direction", defaultValue), false, false);