Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 6190)
+++ /trunk/data/defaultpresets.xml	(revision 6191)
@@ -819,5 +819,5 @@
                 </combo>
                 <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
-                <combo key="trail_visibility" text="Visibility" values="excellent,good,intermediate,bad,horrible,no" />
+                <combo key="trail_visibility" text="Visibility" values="excellent,good,intermediate,bad,horrible,no" values_context="trail_visibility" />
                 <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" />
                 <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,no" />
@@ -2191,5 +2191,5 @@
                 <check key="crossing:light" text="Traffic lights" default="off" />
                 <check key="crossing:bell" text="Sound signals" default="off" />
-                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" />
+                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
             </optional>
         </item>
@@ -2210,5 +2210,5 @@
                 <check key="crossing:light" text="Traffic lights" default="off" />
                 <check key="crossing:bell" text="Sound signals" default="off" />
-                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" />
+                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
             </optional>
         </item>
@@ -4225,5 +4225,5 @@
             <label text="Edit Hunting Stand" />
             <key key="amenity" value="hunting_stand" />
-            <combo key="height" text="Height" values="low,half,full,5,10,15,20" />
+            <combo key="height" text="Height" values="low,half,full,5,10,15,20" values_context="height" />
             <combo key="shelter" text="Shelter" values="yes,no,unknown" />
             <combo key="hide" text="Hide" values="yes,no,unknown" />
@@ -4437,5 +4437,5 @@
             <text key="name" text="Name" />
             <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,snow_park" />
-            <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" />
+            <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" values_context="piste:difficulty" />
             <combo key="piste:grooming" text="Grooming" values="classic,mogul,skating,classic;skating,scooter,backcountry" />
         </item>