Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 6702)
+++ trunk/data/defaultpresets.xml	(revision 6703)
@@ -284,4 +284,10 @@
         </optional>
     </chunk>
+    <chunk id="optional_maxheight_maxwidth">
+        <optional>
+            <text key="maxheight" text="Max. height (meters)" length="7" />
+            <text key="maxwidth" text="Max. width (meters)" length="7" />
+        </optional>
+    </chunk>
     <chunk id="name_leisure_pitch">
         <text key="name" text="Name" />
@@ -320,4 +326,7 @@
         <reference ref="oh" />
     </chunk>
+    <chunk id="general_access">
+        <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" values_searchable="true" />
+    </chunk>
   <!-- Link chunks -->
   <chunk id="link_contact">
@@ -1262,5 +1271,5 @@
         </item> <!-- cycle_barrier -->
         <item name="Cattle Grid" icon="presets/cattle_grid.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=cattle_grid"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=cattle_grid"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=cattle_grid" />
@@ -1298,4 +1307,5 @@
         </item> <!-- toll_booth -->
         <item name="Border Control" icon="presets/douane.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=border_control" />
             <label text="Edit Border Control" />
             <key key="barrier" value="border_control" />
@@ -1391,4 +1401,5 @@
         </item> <!-- ditch -->
         <item name="Kerb" type="way,closedway">
+            <link pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=kerb" />
             <label text="Edit Kerb" />
             <key key="barrier" value="kerb" />
@@ -1416,5 +1427,6 @@
             <key key="barrier" value="gate" />
             <reference ref="barrier_5" />
-            <reference ref="optional_maxwidth" />
+            <reference ref="optional_maxheight_maxwidth" />
+            <reference ref="general_access" />
         </item> <!-- gate -->
         <item name="Lift Gate" icon="presets/lift_gate.png" type="node">
@@ -1429,4 +1441,5 @@
             <reference ref="barrier_5" />
             <reference ref="optional_maxwidth" />
+            <reference ref="general_access" />
         </item> <!-- lift_gate -->
         <item name="Hampshire Gate" icon="presets/empty.png" type="node">
@@ -2537,5 +2550,5 @@
             <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" />
@@ -4852,5 +4865,9 @@
             <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" />
+                <text key="addr:flats" text="Flat numbers" />
+            </optional>
         </item>
         <item name="Tower" icon="presets/tower.png" type="node,closedway">