Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 11279)
+++ /trunk/data/defaultpresets.xml	(revision 11280)
@@ -332,5 +332,5 @@
     </chunk>
     <chunk id="waterway">
-        <reference ref="name_layer" />
+        <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
         <check key="intermittent" text="Intermittent" disable_off="true" />
         <check key="seasonal" text="Seasonal" disable_off="true" />
@@ -2001,4 +2001,5 @@
             <key key="waterway" value="drain" />
             <optional>
+                <text key="name" text="Name" />
                 <reference ref="waterway" />
             </optional>
@@ -2015,4 +2016,5 @@
             <key key="waterway" value="ditch" />
             <optional>
+                <text key="name" text="Name" />
                 <reference ref="waterway" />
             </optional>
@@ -2032,4 +2034,5 @@
             <space />
             <key key="waterway" value="stream" />
+            <text key="name" text="Name" />
             <optional>
                 <reference ref="waterway_wikipedia" />
@@ -2051,6 +2054,8 @@
             <space />
             <key key="waterway" value="river" />
+            <text key="name" text="Name" />
             <optional>
                 <reference ref="waterway_wikipedia" />
+                <check key="lock" text="Lock" disable_off="true" />
             </optional>
             <reference ref="water_access" />
@@ -2067,9 +2072,11 @@
             <space />
             <key key="waterway" value="canal" />
-            <optional>
-                <reference ref="name_layer" />
+            <text key="name" text="Name" />
+            <optional>
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
                 <combo key="tunnel" text="Tunnel" values="culvert,yes" />
                 <text key="width" text="Width (meters)" />
                 <text key="wikipedia" text="Wikipedia" />
+                <check key="lock" text="Lock" disable_off="true" />
             </optional>
             <reference ref="water_access" />
@@ -5420,5 +5427,5 @@
             <space />
             <key key="amenity" value="hunting_stand" />
-            <combo key="height" text="Height" values="low,half,full,5,10,15,20" values_context="height" />
+            <text key="height" text="Height (meters)" />
             <check key="shelter" text="Shelter" />
             <check key="hide" text="Hide" text_context="hunting stand" />