Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 6255)
+++ trunk/data/defaultpresets.xml	(revision 6256)
@@ -4710,5 +4710,5 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:building" />
             <label text="Edit Building" />
-            <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,farm,transportation,greenhouse,office,university,hospital,warehouse,retail" default="yes" match="keyvalue" />
+            <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,farm,transportation,greenhouse,office,university,hospital,warehouse,retail" values_context="building" default="yes" match="keyvalue" />
             <text key="name" text="Name" />
         </item>
@@ -4735,5 +4735,5 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:entrance" />
             <label text="Edit Entrance" />
-            <combo key="entrance" text="Entrance" values="yes,main,service,exit,emergency" default="yes" match="key" />
+            <combo key="entrance" text="Entrance" values="yes,main,service,exit,emergency" values_context="entrance" default="yes" match="key" />
             <combo key="access" text="Access" values="yes,delivery,private,no" />
             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />