Index: data/defaultpresets.xml
===================================================================
--- data/defaultpresets.xml	(revision 6700)
+++ data/defaultpresets.xml	(working copy)
@@ -1395,6 +1395,8 @@
             <key key="barrier" value="gate" />
             <reference ref="barrier_5" />
             <reference ref="optional_maxwidth" />
+            <text key="maxheight" text="Max. height (meters)" length="7" />
+            <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" values_searchable="true" />
         </item> <!-- gate -->
         <item name="Lift Gate" icon="presets/lift_gate.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=lift_gate"
@@ -1407,6 +1409,7 @@
             <key key="barrier" value="lift_gate" />
             <reference ref="barrier_5" />
             <reference ref="optional_maxwidth" />
+			<combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" match="key" values_searchable="true" />
         </item> <!-- lift_gate -->
         <item name="Hampshire Gate" icon="presets/empty.png" type="node">
             <label text="Edit Hampshire Gate" />
@@ -2533,7 +2536,7 @@
             <key key="amenity" value="bicycle_parking" />
             <reference ref="name_operator" />
             <text key="capacity" text="Capacity" />
-            <combo key="bicycle_parking" text="Type" values="anchors,building,ground_slots,informal,lockers,shed,stands,wall_loops" />
+            <combo key="bicycle_parking" text="Type" values="anchors,building,ground_slots,informal,lockers,rack,shed,stands,wall_loops" />
             <check key="covered" text="Covered" />
             <check key="supervised" text="Supervised" />
         </item>
@@ -4848,7 +4851,11 @@
             <space />
             <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" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no,limited" />
+            <optional>
+                <text key="ref" text="Entrance number" default="" delete_if_empty="true"/>
+                <text key="addr:flats" text="Flat numbers" default="" delete_if_empty="true"/>
+            </optional>
         </item>
         <item name="Tower" icon="presets/tower.png" type="node,closedway">
             <label text="Edit Tower" />