Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 7702)
+++ /trunk/data/defaultpresets.xml	(revision 7703)
@@ -331,4 +331,5 @@
                 <text key="name" text="Name" />
                 <reference ref="highway_base" />
+                <text key="width" text="Width (meters)" />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
@@ -355,4 +356,5 @@
             <optional>
                 <reference ref="highway_base" />
+                <text key="width" text="Width (meters)" />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
@@ -382,4 +384,5 @@
                 <text key="name" text="Name" />
                 <reference ref="highway_base" />
+                <text key="width" text="Width (meters)" />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
@@ -407,4 +410,5 @@
             <optional>
                 <reference ref="highway_base" />
+                <text key="width" text="Width (meters)" />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
@@ -438,5 +442,5 @@
                 <reference ref="highway_base" />
                 <check key="motorroad" text="Motorroad" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
         </item> <!-- Primary -->
@@ -453,5 +457,5 @@
                 <reference ref="highway_base" />
                 <check key="motorroad" text="Motorroad" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
         </item> <!-- Primary Link -->
@@ -474,5 +478,5 @@
                 <text key="name" text="Name" />
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
         </item> <!-- Secondary -->
@@ -488,5 +492,5 @@
             <optional>
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
         </item> <!-- Secondary Link -->
@@ -509,5 +513,5 @@
                 <text key="name" text="Name" />
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
         </item> <!-- Tertiary -->
@@ -523,5 +527,5 @@
             <optional>
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
         </item> <!-- Tertiary Link -->
@@ -541,7 +545,6 @@
                 <text key="ref" text="Reference" />
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
                 <check key="passing_places" text="Passing Places" />
-                <text key="width" text="Width (meters)" />
             </optional>
         </item> <!-- Unclassified -->
@@ -563,6 +566,5 @@
                 <text key="ref" text="Reference" />
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
         </item> <!-- Residential -->
@@ -605,6 +607,5 @@
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
                 <reference ref="surface" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
         </item> <!-- Living Street -->
@@ -648,7 +649,6 @@
                 <text key="name" text="Name" />
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
                 <check key="passing_places" text="Passing Places" />
-                <text key="width" text="Width (meters)" />
             </optional>
         </item> <!-- Service -->
@@ -699,7 +699,6 @@
                 <text key="name" text="Name" />
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
                 <combo key="junction" text="Junction" values="roundabout,jughandle,yes" />
-                <text key="width" text="Width (meters)" />
             </optional>
         </item> <!-- Construction -->
@@ -809,5 +808,5 @@
                 <reference ref="name_layer" />
                 <combo key="surface" text="Surface" values="paved,concrete,cobblestone,gravel,ground,grass,sand" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
                 <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
                 <reference ref="general_access" />
@@ -815,5 +814,4 @@
                 <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
                 <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
-                <text key="width" text="Width (meters)" />
             </optional>
         </item> <!-- Track -->
@@ -834,5 +832,5 @@
                 <reference ref="name_layer" />
                 <reference ref="surface" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
                 <combo key="sac_scale" text="SAC Scale" values_searchable="true">
                     <list_entry value="hiking" display_value="T1 - hiking trail" short_description="Trail well cleared. Area flat or slightly sloped, no fall hazard" />
@@ -852,5 +850,4 @@
                 <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,private,no" />
                 <!-- <combo key="motorcar" text="Motorcar" values="yes,designated,no" default="no" /> -->
-                <text key="width" text="Width (meters)" />
             </optional>
         </item> <!-- Path -->
@@ -869,6 +866,5 @@
                 <text key="maxspeed" text="Max. speed (km/h)" />
                 <reference ref="surface" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
         </item> <!-- Dedicated Bridleway -->
@@ -911,7 +907,6 @@
                 <reference ref="name_layer" />
                 <reference ref="surface" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
                 <combo key="foot" text="Pedestrians" values="unknown,yes,no" />
-                <text key="width" text="Width (meters)" />
             </optional>
         </item> <!-- Dedicated Cycleway -->
@@ -927,6 +922,5 @@
                 <reference ref="name_layer" />
                 <reference ref="surface" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
         </item> <!-- Segregated Foot- and Cycleway -->
@@ -942,7 +936,6 @@
                 <reference ref="name_layer" />
                 <reference ref="surface" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
                 <check key="passing_places" text="Passing Places" />
-                <text key="width" text="Width (meters)" />
             </optional>
         </item> <!-- Combined Foot- and Cycleway -->
@@ -984,6 +977,5 @@
                 <reference ref="surface" />
                 <text key="step_count" text="Amount of Steps" />
-                <reference ref="highway_yesno_incline_oneway_lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
         </item> <!-- Steps -->
@@ -5748,5 +5740,5 @@
             <key key="historic" value="memorial" />
             <text key="name" text="Name" />
-            <combo key="memorial" text="Type" values="statue,bust,plaque,stele,stone,war_memorial" />
+            <combo key="memorial" text="Type" values="statue,bust,plaque,stele,stone,war_memorial" values_context="memorial" />
             <optional>
                 <text key="inscription" text="Inscription" />