Index: /trunk/presets/presets.xml
===================================================================
--- /trunk/presets/presets.xml	(revision 1409)
+++ /trunk/presets/presets.xml	(revision 1410)
@@ -811,5 +811,5 @@
             </optional>
         </item>
-        <item name="Mountain Pass" icon="presets/mountain_pass.png">
+        <item name="Mountain Pass" icon="presets/mountain_pass.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
             <label text="Edit Mountain Pass" />
@@ -823,5 +823,5 @@
     </group> <!-- Waypoints -->
     <group name="Barriers" icon="presets/barrier.png">
-        <item name="Stile" icon="presets/stile.png">
+        <item name="Stile" icon="presets/stile.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
             <label text="Edit a Stile" />
@@ -833,5 +833,5 @@
             <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
         </item> <!-- stile -->
-        <item name="Kissing Gate" icon="presets/empty.png">
+        <item name="Kissing Gate" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit a Kissing Gate" />
             <space />
@@ -842,5 +842,5 @@
             <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
         </item> <!-- kissing_gate -->
-        <item name="Hampshire Gate" icon="presets/empty.png">
+        <item name="Hampshire Gate" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit a Hampshire Gate" />
             <space />
@@ -854,5 +854,5 @@
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- hampshire_gate -->
-        <item name="Bollard" icon="presets/bollard.png">
+        <item name="Bollard" icon="presets/bollard.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
             <label text="Edit a bollard" />
@@ -866,5 +866,5 @@
             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
         </item> <!-- bollard -->
-        <item name="Drawbridge" icon="presets/empty.png">
+        <item name="Drawbridge" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit a Drawbridge" />
             <space />
@@ -878,8 +878,8 @@
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- drawbridge -->
-        <item name="Bus Trap" icon="presets/empty.png">
+        <item name="Bus Trap" icon="presets/empty.png" type="node,way,closedway">
             <key key="barrier" value="bus_trap" />
         </item> <!-- bus_trap -->
-        <item name="Cattle Grid" icon="presets/cattle_grid.png">
+        <item name="Cattle Grid" icon="presets/cattle_grid.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
             <label text="Edit a Cattle Grid" />
@@ -893,5 +893,5 @@
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- cattle_grid -->
-        <item name="Spikes" icon="presets/empty.png">
+        <item name="Spikes" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Spikes" />
             <space />
@@ -905,5 +905,5 @@
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- spikes -->
-        <item name="Portcullis" icon="presets/empty.png">
+        <item name="Portcullis" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit a Portcullis" />
             <space />
@@ -915,5 +915,5 @@
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- portcullis -->
-        <item name="Gate" icon="presets/gate.png">
+        <item name="Gate" icon="presets/gate.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
             <label text="Edit a Gate" />
@@ -928,5 +928,5 @@
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- gate -->
-        <item name="Lift Gate" icon="presets/lift_gate.png">
+        <item name="Lift Gate" icon="presets/lift_gate.png" type="node,way,closedway">
             <label text="Edit a Lift Gate" />
             <space />
@@ -940,5 +940,5 @@
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- lift_gate -->
-        <item name="Sally Port" icon="presets/empty.png">
+        <item name="Sally Port" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit a Sally Port" />
             <space />
@@ -952,5 +952,5 @@
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- sally_port -->
-        <item name="Bump Gate" icon="presets/empty.png">
+        <item name="Bump Gate" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit a Bump Gate" />
             <space />
@@ -964,27 +964,27 @@
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- bump_gate -->
-        <item name="Hedge" icon="presets/empty.png">
+        <item name="Hedge" icon="presets/empty.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
             <key key="barrier" value="hedge" />
         </item> <!-- hedge -->
-        <item name="Fence" icon="presets/empty.png">
+        <item name="Fence" icon="presets/empty.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
             <key key="barrier" value="fence" />
         </item> <!-- fence -->
-        <item name="Block" icon="presets/empty.png">
+        <item name="Block" icon="presets/empty.png" type="node,way,closedway">
             <key key="barrier" value="block" />
         </item> <!-- block -->
-        <item name="Wall" icon="presets/empty.png">
+        <item name="Wall" icon="presets/empty.png" type="node,way,closedway">
             <key key="barrier" value="wall" />
         </item> <!-- wall -->
-        <item name="City Wall" icon="presets/empty.png">
+        <item name="City Wall" icon="presets/empty.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
             <key key="barrier" value="city_wall" />
         </item> <!-- city_wall -->
-        <item name="Retaining Wall" icon="presets/empty.png">
+        <item name="Retaining Wall" icon="presets/empty.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
             <key key="barrier" value="retaining_wall" />
         </item> <!-- retaining_wall -->
-        <item name="Toll Booth" icon="presets/toll_station.png">
+        <item name="Toll Booth" icon="presets/toll_station.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
             <label text="Edit Toll Booth" />
@@ -996,5 +996,5 @@
             </optional>
         </item> <!-- toll_booth -->
-        <item name="Border Control" icon="presets/douane.png">
+        <item name="Border Control" icon="presets/douane.png" type="node,way,closedway">
             <label text="Edit a Border Control" />
             <space />
@@ -1009,5 +1009,5 @@
         </item> <!-- border_control -->
         <separator/>
-        <item name="Entrance" icon="presets/empty.png">
+        <item name="Entrance" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit a Entrance" />
             <space />
@@ -1024,5 +1024,5 @@
     <separator/>
     <group name="Water" icon="presets/waterway.png">
-      <item name="Spring" icon="presets/spring.png">
+      <item name="Spring" icon="presets/spring.png" type="node,way,closedway">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
         <label text="Edit a Spring" />
@@ -1031,5 +1031,5 @@
       </item>
       <separator/>
-      <item name="Drain" icon="presets/waterway.png">
+      <item name="Drain" icon="presets/waterway.png" type="node,way,closedway">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
         <label text="Edit a Drain" />
@@ -1039,5 +1039,5 @@
         <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
       </item>
-      <item name="Stream" icon="presets/waterway.png">
+      <item name="Stream" icon="presets/waterway.png" type="node,way,closedway">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
         <label text="Edit a Stream" />
@@ -1047,5 +1047,5 @@
         <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
       </item>
-      <item name="Canal" icon="presets/waterway.png">
+      <item name="Canal" icon="presets/waterway.png" type="node,way,closedway">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
         <label text="Edit a Canal" />
@@ -1055,5 +1055,5 @@
         <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
       </item>
-      <item name="River" icon="presets/river.png">
+      <item name="River" icon="presets/river.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=river"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
@@ -1066,5 +1066,5 @@
         </item>
         <separator/>
-        <item name="Water" icon="presets/water.png">
+        <item name="Water" icon="presets/water.png" type="node,way,closedway">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
           <label text="Edit Water" />
@@ -1072,5 +1072,5 @@
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Land" icon="presets/landuse.png">
+        <item name="Land" icon="presets/landuse.png" type="node,way,closedway">
           <label text="Edit Land" />
           <key key="natural" value="land" />
@@ -1078,5 +1078,5 @@
         </item>
         <separator/>
-        <item name="Basin" icon="presets/landuse_water.png">
+        <item name="Basin" icon="presets/landuse_water.png" type="node,way,closedway">
           <label text="Edit Basin Landuse" />
           <space />
@@ -1084,5 +1084,5 @@
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Reservoir" icon="presets/landuse_water.png">
+        <item name="Reservoir" icon="presets/landuse_water.png" type="node,way,closedway">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
           <label text="Edit Reservoir Landuse" />
@@ -1091,5 +1091,5 @@
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Covered Reservoir" icon="presets/reservoir_covered.png">
+        <item name="Covered Reservoir" icon="presets/reservoir_covered.png" type="node,way,closedway">
           <label text="Edit Covered Reservoir" />
           <key key="man_made" value="reservoir_covered" />
@@ -1097,5 +1097,5 @@
         </item>
         <separator/>
-        <item name="Riverbank" icon="presets/waterway.png">
+        <item name="Riverbank" icon="presets/waterway.png" type="node,way,closedway">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
                 de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
@@ -1104,5 +1104,5 @@
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Wetland" icon="presets/empty.png">
+        <item name="Wetland" icon="presets/empty.png" type="node,way,closedway">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
                 de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wetland"
@@ -1114,10 +1114,10 @@
           <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove" default="" delete_if_empty="true" />
         </item>
-        <item name="Mud" icon="presets/empty.png">
+        <item name="Mud" icon="presets/empty.png" type="node,way,closedway">
           <label text="Edit Mud" />
           <key key="natural" value="mud" />
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Beach" icon="presets/empty.png">
+        <item name="Beach" icon="presets/empty.png" type="node,way,closedway">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
           <label text="Edit Beach" />
@@ -1125,10 +1125,10 @@
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Bay" icon="presets/empty.png">
+        <item name="Bay" icon="presets/empty.png" type="node,way,closedway">
           <label text="Edit Bay" />
           <key key="natural" value="bay" />
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Cliff" icon="presets/empty.png">
+        <item name="Cliff" icon="presets/empty.png" type="node,way,closedway">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
           <label text="Edit Cliff" />
@@ -1136,5 +1136,5 @@
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Coastline" icon="presets/empty.png">
+        <item name="Coastline" icon="presets/empty.png" type="node,way,closedway">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
           <label text="Edit Coastline" />
@@ -1143,5 +1143,5 @@
         </item>
         <separator/>
-        <item name="Ferry Route" icon="presets/ferry.png">
+        <item name="Ferry Route" icon="presets/ferry.png" type="node,way,closedway">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
           <label text="Edit a Ferry" />
@@ -1153,5 +1153,5 @@
         </item>
         <separator/>
-        <item name="Boatyard" icon="presets/boatyard.png">
+        <item name="Boatyard" icon="presets/boatyard.png" type="node,way,closedway">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
           <label text="Edit a Boatyard" />
@@ -1160,5 +1160,5 @@
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Dock" icon="presets/waterway.png">
+        <item name="Dock" icon="presets/waterway.png" type="node,way,closedway">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
           <label text="Edit a Dock" />
@@ -1168,5 +1168,5 @@
         </item>
         <separator/>
-        <item name="Dam" icon="presets/empty.png">
+        <item name="Dam" icon="presets/empty.png" type="node,way,closedway">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
           <label text="Edit a Dam" />
@@ -1177,9 +1177,9 @@
       </group> <!-- Water -->
     <group name="Waterway Point" icon="presets/waterwaypoint.png">
-        <item name="Lock Gate" icon="presets/lock_gate.png">
+        <item name="Lock Gate" icon="presets/lock_gate.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
             <key key="waterway" value="lock_gate" />
         </item>
-        <item name="Weir" icon="presets/weir.png">
+        <item name="Weir" icon="presets/weir.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
             <label text="Edit a Weir" />
@@ -1188,5 +1188,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Waterfall" icon="presets/waterfall.png">
+        <item name="Waterfall" icon="presets/waterfall.png" type="node,way,closedway">
             <label text="Edit a Waterfall" />
             <space />
@@ -1194,14 +1194,14 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Turning Point" icon="presets/turning.png">
+        <item name="Turning Point" icon="presets/turning.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
             <key key="waterway" value="turning_point" />
         </item>
-        <item name="Marina" icon="presets/marina.png">
+        <item name="Marina" icon="presets/marina.png" type="node,way,closedway">
             <label text="Edit Marina" />
             <key key="leisure" value="marina" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Pier" icon="presets/pier.png">
+        <item name="Pier" icon="presets/pier.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
             <label text="Edit Pier" />
@@ -1209,5 +1209,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Ferry Terminal" icon="presets/empty.png">
+        <item name="Ferry Terminal" icon="presets/empty.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
             <label text="Edit Ferry Terminal" />
@@ -1215,5 +1215,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Slipway" icon="presets/slipway.png">
+        <item name="Slipway" icon="presets/slipway.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -1226,5 +1226,5 @@
     <separator/>
     <group name="Railway" icon="presets/railway.png">
-        <item name="Rail" icon="presets/railway.png">
+        <item name="Rail" icon="presets/railway.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
             <label text="Edit a Rail" />
@@ -1233,5 +1233,5 @@
             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
         </item>
-        <item name="Narrow Gauge Rail" icon="presets/railway.png">
+        <item name="Narrow Gauge Rail" icon="presets/railway.png" type="node,way,closedway">
             <label text="Edit a Narrow Gauge Rail" />
             <space />
@@ -1239,5 +1239,5 @@
             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
         </item>
-        <item name="Monorail" icon="presets/railway.png">
+        <item name="Monorail" icon="presets/railway.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
             <label text="Edit a Monorail" />
@@ -1246,5 +1246,5 @@
             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
         </item>
-        <item name="Preserved" icon="presets/rail_preserved.png">
+        <item name="Preserved" icon="presets/rail_preserved.png" type="node,way,closedway">
             <label text="Edit a Preserved Railway" />
             <space />
@@ -1252,5 +1252,5 @@
             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
         </item>
-        <item name="Light Rail" icon="presets/rail_light.png">
+        <item name="Light Rail" icon="presets/rail_light.png" type="node,way,closedway">
             <label text="Edit a Light Rail" />
             <space />
@@ -1258,5 +1258,5 @@
             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
         </item>
-        <item name="Subway" icon="presets/rail_light.png">
+        <item name="Subway" icon="presets/rail_light.png" type="node,way,closedway">
             <label text="Edit a Subway" />
             <space />
@@ -1264,5 +1264,5 @@
             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
         </item>
-        <item name="Tram" icon="presets/tram.png">
+        <item name="Tram" icon="presets/tram.png" type="node,way,closedway">
             <label text="Edit a Tram" />
             <space />
@@ -1270,5 +1270,5 @@
             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
         </item>
-        <item name="Bus Guideway" icon="presets/busway.png">
+        <item name="Bus Guideway" icon="presets/busway.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
             <label text="Edit a Bus Guideway" />
@@ -1289,5 +1289,5 @@
         </item>
         <separator/>
-        <item name="Disused Rail" icon="presets/railway.png">
+        <item name="Disused Rail" icon="presets/railway.png" type="node,way,closedway">
             <label text="Edit a Disused Railway" />
             <space />
@@ -1295,13 +1295,13 @@
             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
         </item>
-        <item name="Abandoned Rail" icon="presets/railway.png">
+        <item name="Abandoned Rail" icon="presets/railway.png" type="node,way,closedway">
             <key key="railway" value="abandoned" />
         </item>
         <separator/>
-        <item name="Level Crossing" icon="presets/level_crossing.png">
+        <item name="Level Crossing" icon="presets/level_crossing.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
             <key key="railway" value="level_crossing" />
         </item>
-        <item name="Crossing" icon="presets/crossing.png">
+        <item name="Crossing" icon="presets/crossing.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Key:crossing" />
             <key key="railway" value="crossing" />
@@ -1313,5 +1313,5 @@
             </optional>
         </item>
-        <item name="Turntable" icon="presets/turntable.png">
+        <item name="Turntable" icon="presets/turntable.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
             <key key="railway" value="turntable" />
@@ -1319,5 +1319,5 @@
     </group> <!-- Railway -->
     <group name="Aerialway" icon="presets/aerialway.png">
-        <item name="Chair Lift" icon="presets/chair_lift.png">
+        <item name="Chair Lift" icon="presets/chair_lift.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
             <label text="Edit a Chair Lift" />
@@ -1325,5 +1325,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Drag Lift" icon="presets/drag_lift.png">
+        <item name="Drag Lift" icon="presets/drag_lift.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
             <label text="Edit a Drag Lift" />
@@ -1331,5 +1331,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Cable Car" icon="presets/cable_car.png">
+        <item name="Cable Car" icon="presets/cable_car.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
             <label text="Edit a Cable Car" />
@@ -1337,5 +1337,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Station" icon="presets/aerialway_station.png">
+        <item name="Station" icon="presets/aerialway_station.png" type="node,way,closedway">
             <label text="Edit a Station" />
             <key key="aerialway" value="station" />
@@ -1345,5 +1345,5 @@
     <separator/>
     <group name="Car" icon="presets/car.png">
-        <item name="Fuel" icon="presets/fuel.png">
+        <item name="Fuel" icon="presets/fuel.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
@@ -1354,5 +1354,5 @@
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
         </item>
-        <item name="Parking" icon="presets/parking.png">
+        <item name="Parking" icon="presets/parking.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
@@ -1365,5 +1365,5 @@
             <check key="fee" text="Fee" default="off" delete_if_empty="true" />
         </item>
-        <item name="Wash" icon="presets/car_wash.png">
+        <item name="Wash" icon="presets/car_wash.png" type="node,way,closedway">
             <label text="Edit Car Wash" />
             <key key="amenity" value="car_wash" />
@@ -1371,5 +1371,5 @@
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
         </item>
-        <item name="Shop" icon="presets/car_repair.png">
+        <item name="Shop" icon="presets/car_repair.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
             <label text="Edit Car Shop" />
@@ -1378,5 +1378,5 @@
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
         </item>
-        <item name="Repair" icon="presets/car_repair.png">
+        <item name="Repair" icon="presets/car_repair.png" type="node,way,closedway">
             <label text="Edit Car Repair" />
             <key key="shop" value="car_repair" />
@@ -1384,5 +1384,5 @@
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
         </item>
-        <item name="Rental" icon="presets/car_rental.png">
+        <item name="Rental" icon="presets/car_rental.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
@@ -1392,5 +1392,5 @@
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
         </item>
-        <item name="Sharing" icon="presets/car_sharing.png">
+        <item name="Sharing" icon="presets/car_sharing.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
             <label text="Edit Car Sharing" />
@@ -1401,5 +1401,5 @@
     </group> <!-- Car -->
     <group name="Bicycle" icon="presets/bike.png">
-        <item name="Parking" icon="presets/bike_parking.png">
+        <item name="Parking" icon="presets/bike_parking.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
             <label text="Edit Bicycle Parking" />
@@ -1408,5 +1408,5 @@
             <text key="capacity" text="Capacity" default="" delete_if_empty="true" />
         </item>
-        <item name="Rental" icon="presets/bicycle_rental.png">
+        <item name="Rental" icon="presets/bicycle_rental.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
@@ -1415,5 +1415,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Shop" icon="presets/bike.png">
+        <item name="Shop" icon="presets/bike.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
@@ -1424,5 +1424,5 @@
     </group> <!-- Bicycle -->
     <group name="Public Transport" icon="presets/bus.png">
-        <item name="Station" icon="presets/station.png">
+        <item name="Station" icon="presets/station.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
@@ -1435,5 +1435,5 @@
             </optional>
         </item>
-        <item name="Railway Halt" icon="presets/station.png">
+        <item name="Railway Halt" icon="presets/station.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
             <label text="Edit Halt" />
@@ -1444,5 +1444,5 @@
             </optional>
         </item>
-        <item name="Tram Stop" icon="presets/tram.png">
+        <item name="Tram Stop" icon="presets/tram.png" type="node,way,closedway">
            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
@@ -1454,5 +1454,5 @@
             </optional>
         </item>
-        <item name="Railway Platform" icon="presets/platform_rail.png">
+        <item name="Railway Platform" icon="presets/platform_rail.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
@@ -1464,5 +1464,5 @@
             <check key="area" text="Area" default="off" delete_if_empty="true" />
         </item>
-        <item name="Subway Entrance" icon="presets/underground.png">
+        <item name="Subway Entrance" icon="presets/underground.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
@@ -1477,5 +1477,5 @@
         </item>
         <separator/>
-        <item name="Bus Station" icon="presets/bus.png">
+        <item name="Bus Station" icon="presets/bus.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
@@ -1486,5 +1486,5 @@
             </optional>
         </item>
-        <item name="Bus Stop" icon="presets/bus_halt.png">
+        <item name="Bus Stop" icon="presets/bus_halt.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_stop"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
@@ -1497,5 +1497,5 @@
             </optional>
         </item>
-        <item name="Bus Platform" icon="presets/platform_bus.png">
+        <item name="Bus Platform" icon="presets/platform_bus.png" type="node,way,closedway">
             <label text="Edit a bus platform" />
             <key key="highway" value="platform" />
@@ -1506,5 +1506,5 @@
         </item>
         <separator/>
-        <item name="Taxi" icon="presets/taxi.png">
+        <item name="Taxi" icon="presets/taxi.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
             <label text="Edit a Taxi station" />
@@ -1513,5 +1513,5 @@
         </item>
         <separator/>
-        <item name="Airport" icon="presets/plane.png">
+        <item name="Airport" icon="presets/plane.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
             <label text="Edit an airport" />
@@ -1527,5 +1527,5 @@
     <separator/>
     <group name="Accomodation" icon="presets/bed.png">
-        <item name="Hotel" icon="presets/bed.png">
+        <item name="Hotel" icon="presets/bed.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
@@ -1535,5 +1535,5 @@
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" default="" delete_if_empty="true" />
         </item>
-        <item name="Motel" icon="presets/bed.png">
+        <item name="Motel" icon="presets/bed.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
             <label text="Edit Motel" />
@@ -1541,10 +1541,10 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Guest House" icon="presets/bed.png">
+        <item name="Guest House" icon="presets/bed.png" type="node,way,closedway">
             <label text="Edit Guest House" />
             <key key="tourism" value="guest_house" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Chalet" icon="presets/empty.png">
+        <item name="Chalet" icon="presets/empty.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
             <label text="Edit Chalet" />
@@ -1552,5 +1552,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Hostel" icon="presets/hostel.png">
+        <item name="Hostel" icon="presets/hostel.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
             <label text="Edit Hostel" />
@@ -1558,5 +1558,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Alpine Hut" icon="presets/hostel.png">
+        <item name="Alpine Hut" icon="presets/hostel.png" type="node,way,closedway">
             <label text="Edit Alpine Hut" />
             <key key="tourism" value="alpine_hut" />
@@ -1564,10 +1564,10 @@
             <text key="ele" text="Elevation" default="" delete_if_empty="true" />
         </item>
-        <item name="Caravan Site" icon="presets/caravan2.png">
+        <item name="Caravan Site" icon="presets/caravan2.png" type="node,way,closedway">
             <label text="Edit Caravan Site" />
             <key key="tourism" value="caravan_site" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Camping Site" icon="presets/tent.png">
+        <item name="Camping Site" icon="presets/tent.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
             <label text="Edit Camping Site" />
@@ -1577,5 +1577,5 @@
     </group> <!-- Accomodation -->
     <group name="Food+Drinks" icon="presets/restaurant.png">
-        <item name="Restaurant" icon="presets/restaurant.png">
+        <item name="Restaurant" icon="presets/restaurant.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
             <label text="Edit Restaurant" />
@@ -1584,5 +1584,5 @@
             <combo key="cuisine" text="Cuisine" values="italian,chinese,pizza,burger,greek,german,indian,regional,kebab,turkish,asian,thai,mexican,japanese" default="" delete_if_empty="true" />
         </item>
-        <item name="Fast Food" icon="presets/fastfood.png">
+        <item name="Fast Food" icon="presets/fastfood.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
             <label text="Edit Fast Food Restaurant" />
@@ -1591,5 +1591,5 @@
             <combo key="cuisine" text="Cuisine" values="italian,chinese,pizza,burger,greek,german,indian,regional,kebab,turkish,asian,thai,mexican,japanese" default="" delete_if_empty="true" />
         </item>
-        <item name="Cafe" icon="presets/cafe.png">
+        <item name="Cafe" icon="presets/cafe.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
             <label text="Edit Cafe" />
@@ -1597,5 +1597,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Pub" icon="presets/pub.png">
+        <item name="Pub" icon="presets/pub.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
             <label text="Edit Pub" />
@@ -1603,10 +1603,10 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Biergarten" icon="presets/biergarten.png">
+        <item name="Biergarten" icon="presets/biergarten.png" type="node,way,closedway">
             <label text="Edit Biergarten" />
             <key key="amenity" value="biergarten" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Nightclub" icon="presets/bar.png">
+        <item name="Nightclub" icon="presets/bar.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
             <label text="Edit Nightclub" />
@@ -1616,10 +1616,10 @@
     </group> <!-- Food+Drinks -->
     <group name="Tourism" icon="presets/State_Public.png">
-        <item name="Attraction" icon="presets/sightseeing.png">
+        <item name="Attraction" icon="presets/sightseeing.png" type="node,way,closedway">
             <label text="Edit Attraction" />
             <key key="tourism" value="attraction" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Information point" icon="presets/information.png">
+        <item name="Information point" icon="presets/information.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=information" />
             <label text="Edit Information Point" />
@@ -1628,5 +1628,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Museum" icon="presets/State_Public.png">
+        <item name="Museum" icon="presets/State_Public.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
             <label text="Edit Museum" />
@@ -1634,5 +1634,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Zoo" icon="presets/zoo.png">
+        <item name="Zoo" icon="presets/zoo.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
@@ -1641,5 +1641,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Viewpoint" icon="presets/viewpoint.png">
+        <item name="Viewpoint" icon="presets/viewpoint.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
             <label text="Edit Viewpoint" />
@@ -1648,10 +1648,10 @@
 <!--<check key="man_made" value="tower" text="Look-Out Tower" default="off" delete_if_empty="true" />-->
         </item>
-        <item name="Theme Park" icon="presets/theme_park.png">
+        <item name="Theme Park" icon="presets/theme_park.png" type="node,way,closedway">
             <label text="Edit Theme Park" />
             <key key="tourism" value="theme_park" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Artwork" icon="presets/arts_centre.png">
+        <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
             <label text="Edit Artwork" />
@@ -1660,5 +1660,5 @@
         </item>
         <separator/>
-        <item name="Shelter" icon="presets/shelter.png">
+        <item name="Shelter" icon="presets/shelter.png" type="node,way,closedway">
             <label text="Edit Shelter" />
             <key key="amenity" value="shelter" />
@@ -1666,5 +1666,5 @@
             <check key="fireplace" text="Fireplace" default="off" delete_if_empty="true" />
         </item>
-        <item name="Picnic Site" icon="presets/picnic.png">
+        <item name="Picnic Site" icon="presets/picnic.png" type="node,way,closedway">
             <label text="Edit Picnic Site" />
             <key key="tourism" value="picnic_site" />
@@ -1674,5 +1674,5 @@
     </group> <!-- Tourism -->
     <group name="Historic Places" icon="presets/State_Tourist.png">
-        <item name="Castle" icon="presets/State_Tourist.png">
+        <item name="Castle" icon="presets/State_Tourist.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
@@ -1681,10 +1681,10 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Ruins" icon="presets/ruins.png">
+        <item name="Ruins" icon="presets/ruins.png" type="node,way,closedway">
             <label text="Edit Ruins" />
             <key key="historic" value="ruins" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Archaeological Site" icon="presets/historic.png">
+        <item name="Archaeological Site" icon="presets/historic.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
@@ -1693,10 +1693,10 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Monument" icon="presets/monument.png">
+        <item name="Monument" icon="presets/monument.png" type="node,way,closedway">
             <label text="Edit Monument" />
             <key key="historic" value="monument" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Memorial" icon="presets/memorial.png">
+        <item name="Memorial" icon="presets/memorial.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
             <label text="Edit Memorial" />
@@ -1704,5 +1704,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Battlefield" icon="presets/battlefield.png">
+        <item name="Battlefield" icon="presets/battlefield.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
             <label text="Edit Battlefield" />
@@ -1710,10 +1710,10 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Wayside Cross" icon="presets/wayside_cross.png">
+        <item name="Wayside Cross" icon="presets/wayside_cross.png" type="node,way,closedway">
             <label text="Edit a Wayside Cross" />
             <key key="historic" value="wayside_cross" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Wayside Shrine" icon="presets/wayside_shrine.png">
+        <item name="Wayside Shrine" icon="presets/wayside_shrine.png" type="node,way,closedway">
             <label text="Edit a Wayside Shrine" />
             <key key="historic" value="wayside_shrine" />
@@ -1722,10 +1722,10 @@
     </group> <!-- Historic Places -->
     <group name="Leisure" icon="presets/kindergarten.png">
-        <item name="Water Park" icon="presets/swimming.png">
+        <item name="Water Park" icon="presets/swimming.png" type="node,way,closedway">
             <label text="Edit Water Park" />
             <key key="leisure" value="water_park" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Playground" icon="presets/playground.png">
+        <item name="Playground" icon="presets/playground.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
             <label text="Edit Playground" />
@@ -1733,5 +1733,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Fishing" icon="presets/fishing.png">
+        <item name="Fishing" icon="presets/fishing.png" type="node,way,closedway">
             <label text="Edit Fishing" />
             <key key="leisure" value="fishing" />
@@ -1741,5 +1741,5 @@
     <separator/>
     <group name="Sport Facilities" icon="presets/stadium.png">
-        <item name="Stadium" icon="presets/stadium.png">
+        <item name="Stadium" icon="presets/stadium.png" type="node,way,closedway">
             <label text="Edit Stadium" />
             <key key="leisure" value="stadium" />
@@ -1750,5 +1750,5 @@
             <combo key="sport" text="sport" values="multi,archery,athletics,australian_football,baseball,basketball,boules,bowls,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
         </item>
-        <item name="Sports Centre" icon="presets/sports_centre.png">
+        <item name="Sports Centre" icon="presets/sports_centre.png" type="node,way,closedway">
             <label text="Edit Sports Centre" />
             <key key="leisure" value="sports_centre" />
@@ -1759,5 +1759,5 @@
             <combo key="sport" text="sport" values="multi,archery,athletics,australian_football,baseball,basketball,boules,bowls,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
         </item>
-        <item name="Pitch" icon="presets/pitch.png">
+        <item name="Pitch" icon="presets/pitch.png" type="node,way,closedway">
             <label text="Edit Pitch" />
             <key key="leisure" value="pitch" />
@@ -1768,5 +1768,5 @@
             <combo key="sport" text="sport" values="multi,archery,athletics,australian_football,baseball,basketball,boules,bowls,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
         </item>
-        <item name="Racetrack" icon="presets/stadium.png">
+        <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway">
             <label text="Edit Racetrack" />
             <key key="leisure" value="track" />
@@ -1777,10 +1777,10 @@
             <combo key="sport" text="sport" values="multi,archery,athletics,australian_football,baseball,basketball,boules,bowls,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
         </item>
-        <item name="Golf Course" icon="presets/golf.png">
+        <item name="Golf Course" icon="presets/golf.png" type="node,way,closedway">
             <label text="Edit Golf Course" />
             <key key="leisure" value="golf_course" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Miniature Golf" icon="presets/golf.png">
+        <item name="Miniature Golf" icon="presets/golf.png" type="node,way,closedway">
             <label text="Edit Miniature Golf" />
             <key key="leisure" value="miniature_golf" />
@@ -1789,5 +1789,5 @@
     </group>
     <group name="Sport" icon="presets/rowing.png">
-        <item name="Multi" icon="presets/empty.png">
+        <item name="Multi" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Multi" />
             <key key="sport" value="multi" />
@@ -1795,5 +1795,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="10pin" icon="presets/empty.png">
+        <item name="10pin" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit 10pin" />
             <key key="sport" value="10pin" />
@@ -1801,5 +1801,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Athletics" icon="presets/empty.png">
+        <item name="Athletics" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Athletics" />
             <key key="sport" value="athletics" />
@@ -1807,5 +1807,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Archery" icon="presets/empty.png">
+        <item name="Archery" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Archery" />
             <key key="sport" value="archery" />
@@ -1813,5 +1813,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Climbing" icon="presets/empty.png">
+        <item name="Climbing" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Climbing" />
             <key key="sport" value="climbing" />
@@ -1819,5 +1819,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Canoeing" icon="presets/canoe.png">
+        <item name="Canoeing" icon="presets/canoe.png" type="node,way,closedway">
             <label text="Edit Canoeing" />
             <key key="sport" value="canoe" />
@@ -1825,5 +1825,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Cycling" icon="presets/cycling.png">
+        <item name="Cycling" icon="presets/cycling.png" type="node,way,closedway">
             <label text="Edit Cycling" />
             <key key="sport" value="cycling" />
@@ -1831,5 +1831,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Dog Racing" icon="presets/empty.png">
+        <item name="Dog Racing" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Dog Racing" />
             <key key="sport" value="dog_racing" />
@@ -1837,5 +1837,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Equestrian" icon="presets/equestrian.png">
+        <item name="Equestrian" icon="presets/equestrian.png" type="node,way,closedway">
             <label text="Edit Equestrian" />
             <key key="sport" value="equestrian" />
@@ -1843,5 +1843,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Horse Racing" icon="presets/equestrian.png">
+        <item name="Horse Racing" icon="presets/equestrian.png" type="node,way,closedway">
             <label text="Edit Horse Racing" />
             <key key="sport" value="horse_racing" />
@@ -1849,5 +1849,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Gymnastics" icon="presets/gymnastics.png">
+        <item name="Gymnastics" icon="presets/gymnastics.png" type="node,way,closedway">
             <label text="Edit Gymnastics" />
             <key key="sport" value="gymnastics" />
@@ -1855,5 +1855,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Motor Sports" icon="presets/motorbike.png">
+        <item name="Motor Sports" icon="presets/motorbike.png" type="node,way,closedway">
             <label text="Edit Motor Sports" />
             <key key="sport" value="motor" />
@@ -1861,5 +1861,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Skating" icon="presets/empty.png">
+        <item name="Skating" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Skating" />
             <key key="sport" value="skating" />
@@ -1867,5 +1867,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Skateboard" icon="presets/empty.png">
+        <item name="Skateboard" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Skateboard" />
             <key key="sport" value="skateboard" />
@@ -1873,5 +1873,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Swimming" icon="presets/swimming.png">
+        <item name="Swimming" icon="presets/swimming.png" type="node,way,closedway">
             <label text="Edit Swimming" />
             <key key="sport" value="swimming" />
@@ -1879,5 +1879,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Skiing" icon="presets/skiing_downhill.png">
+        <item name="Skiing" icon="presets/skiing_downhill.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
             <label text="Edit Skiing" />
@@ -1888,5 +1888,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Shooting" icon="presets/range.png">
+        <item name="Shooting" icon="presets/range.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
             <label text="Edit Shooting" />
@@ -1897,5 +1897,5 @@
     </group>
     <group name="Sport (Ball)" icon="presets/soccer.png">
-        <item name="Soccer" icon="presets/soccer.png">
+        <item name="Soccer" icon="presets/soccer.png" type="node,way,closedway">
             <label text="Edit Soccer" />
             <key key="sport" value="soccer" />
@@ -1903,5 +1903,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Football" icon="presets/football.png">
+        <item name="Football" icon="presets/football.png" type="node,way,closedway">
             <label text="Edit Football" />
             <key key="sport" value="football" />
@@ -1909,5 +1909,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Australian Football" icon="presets/football.png">
+        <item name="Australian Football" icon="presets/football.png" type="node,way,closedway">
             <label text="Edit Australian Football" />
             <key key="sport" value="australian_football" />
@@ -1915,5 +1915,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Baseball" icon="presets/baseball.png">
+        <item name="Baseball" icon="presets/baseball.png" type="node,way,closedway">
             <label text="Edit Baseball" />
             <key key="sport" value="baseball" />
@@ -1921,5 +1921,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Basketball" icon="presets/basketball.png">
+        <item name="Basketball" icon="presets/basketball.png" type="node,way,closedway">
             <label text="Edit Basketball" />
             <key key="sport" value="basketball" />
@@ -1927,5 +1927,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Golf" icon="presets/golf.png">
+        <item name="Golf" icon="presets/golf.png" type="node,way,closedway">
             <label text="Edit Golf" />
             <key key="sport" value="golf" />
@@ -1933,5 +1933,5 @@
             <combo key="leisure" text="type" values="golf_course,pitch,sports_centre,stadium,track" default="golf_course" delete_if_empty="true" />
         </item>
-        <item name="Boule" icon="presets/boule.png">
+        <item name="Boule" icon="presets/boule.png" type="node,way,closedway">
             <label text="Edit Boule" />
             <key key="sport" value="boules" />
@@ -1939,5 +1939,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Bowls" icon="presets/boule.png">
+        <item name="Bowls" icon="presets/boule.png" type="node,way,closedway">
             <label text="Edit Bowls" />
             <key key="sport" value="bowls" />
@@ -1945,5 +1945,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Cricket" icon="presets/cricket.png">
+        <item name="Cricket" icon="presets/cricket.png" type="node,way,closedway">
             <label text="Edit Cricket" />
             <key key="sport" value="cricket" />
@@ -1951,5 +1951,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Cricket Nets" icon="presets/empty.png">
+        <item name="Cricket Nets" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Cricket Nets" />
             <key key="sport" value="cricket_nets" />
@@ -1957,5 +1957,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Croquet" icon="presets/empty.png">
+        <item name="Croquet" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Croquet" />
             <key key="sport" value="croquet" />
@@ -1963,5 +1963,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Hockey" icon="presets/Hockey.png">
+        <item name="Hockey" icon="presets/Hockey.png" type="node,way,closedway">
             <label text="Edit Hockey" />
             <key key="sport" value="hockey" />
@@ -1969,5 +1969,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Pelota" icon="presets/empty.png">
+        <item name="Pelota" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Pelota" />
             <key key="sport" value="pelota" />
@@ -1975,5 +1975,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Racquet" icon="presets/racquetball.png">
+        <item name="Racquet" icon="presets/racquetball.png" type="node,way,closedway">
             <label text="Edit Racquet" />
             <key key="sport" value="racquet" />
@@ -1981,5 +1981,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Rugby" icon="presets/football.png">
+        <item name="Rugby" icon="presets/football.png" type="node,way,closedway">
             <label text="Edit Rugby" />
             <key key="sport" value="rugby" />
@@ -1987,5 +1987,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Table Tennis" icon="presets/table_tennis.png">
+        <item name="Table Tennis" icon="presets/table_tennis.png" type="node,way,closedway">
             <label text="Edit Table Tennis" />
             <key key="sport" value="table_tennis" />
@@ -1993,5 +1993,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Tennis" icon="presets/tennis.png">
+        <item name="Tennis" icon="presets/tennis.png" type="node,way,closedway">
             <label text="Edit Tennis" />
             <key key="sport" value="tennis" />
@@ -2002,8 +2002,8 @@
     <separator/>
     <group name="Buildings" icon="presets/townhall.png">
-        <item name="Building" icon="presets/empty.png">
+        <item name="Building" icon="presets/empty.png" type="node,way,closedway">
             <key key="building" value="yes" />
         </item>
-        <item name="Public Building" icon="presets/empty.png">
+        <item name="Public Building" icon="presets/empty.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
             <label text="Edit Public Building" />
@@ -2011,5 +2011,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Town hall" icon="presets/townhall.png">
+        <item name="Town hall" icon="presets/townhall.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
             <label text="Edit Town hall" />
@@ -2017,5 +2017,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Embassy" icon="presets/empty.png">
+        <item name="Embassy" icon="presets/empty.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
             <label text="Edit Embassy" />
@@ -2023,5 +2023,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Courthouse" icon="presets/JusticeScales.png">
+        <item name="Courthouse" icon="presets/JusticeScales.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
@@ -2030,5 +2030,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Prison" icon="presets/prison.png">
+        <item name="Prison" icon="presets/prison.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
@@ -2037,5 +2037,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Police" icon="presets/police.png">
+        <item name="Police" icon="presets/police.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=police"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
@@ -2045,5 +2045,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Fire Station" icon="presets/firebrigade.png">
+        <item name="Fire Station" icon="presets/firebrigade.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
@@ -2052,5 +2052,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Post Office" icon="presets/letter.png">
+        <item name="Post Office" icon="presets/letter.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
             <label text="Edit Post Office" />
@@ -2059,10 +2059,10 @@
         </item>
         <separator/>
-        <item name="Kindergarten" icon="presets/kindergarten.png">
+        <item name="Kindergarten" icon="presets/kindergarten.png" type="node,way,closedway">
             <label text="Edit Kindergarten" />
             <key key="amenity" value="kindergarten" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="School" icon="presets/school.png">
+        <item name="School" icon="presets/school.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
             <label text="Edit School" />
@@ -2070,5 +2070,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="University" icon="presets/empty.png">
+        <item name="University" icon="presets/empty.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
             <label text="Edit University" />
@@ -2076,5 +2076,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="College" icon="presets/empty.png">
+        <item name="College" icon="presets/empty.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
             <label text="Edit College" />
@@ -2083,5 +2083,5 @@
         </item>
         <separator/>
-        <item name="Cinema" icon="presets/cinema.png">
+        <item name="Cinema" icon="presets/cinema.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
@@ -2090,5 +2090,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Library" icon="styles/standard/shopping/rental/library.png">
+        <item name="Library" icon="styles/standard/shopping/rental/library.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
@@ -2097,5 +2097,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Arts Centre" icon="presets/arts_centre.png">
+        <item name="Arts Centre" icon="presets/arts_centre.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
             <label text="Edit Arts Centre" />
@@ -2103,5 +2103,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Theatre" icon="presets/theater.png">
+        <item name="Theatre" icon="presets/theater.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
@@ -2110,5 +2110,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Place of Worship" icon="presets/church.png">
+        <item name="Place of Worship" icon="presets/church.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
@@ -2121,5 +2121,5 @@
         </item>
         <separator/>
-        <item name="Addresses" icon="presets/addresses.png">
+        <item name="Addresses" icon="presets/addresses.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
                   de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
@@ -2135,5 +2135,5 @@
             </optional>
         </item>
-        <item name="Address Interpolation" icon="presets/addresses.png">
+        <item name="Address Interpolation" icon="presets/addresses.png" type="node,way,closedway">
            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
                  de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
@@ -2144,25 +2144,25 @@
     </group> <!-- Buildings -->
     <group name="Man Made" icon="presets/works.png">
-        <item name="Works" icon="presets/works.png">
+        <item name="Works" icon="presets/works.png" type="node,way,closedway">
             <label text="Edit Works" />
             <key key="man_made" value="works" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Tower" icon="presets/tower.png">
+        <item name="Tower" icon="presets/tower.png" type="node,way,closedway">
             <label text="Edit Tower" />
             <key key="man_made" value="tower" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Water Tower" icon="presets/water_tower.png">
+        <item name="Water Tower" icon="presets/water_tower.png" type="node,way,closedway">
             <label text="Edit Water Tower" />
             <key key="man_made" value="water_tower" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Gasometer" icon="presets/gasometer.png">
+        <item name="Gasometer" icon="presets/gasometer.png" type="node,way,closedway">
             <label text="Edit Gasometer" />
             <key key="man_made" value="gasometer" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Lighthouse" icon="presets/lighthouse.png">
+        <item name="Lighthouse" icon="presets/lighthouse.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
             <label text="Edit Lighthouse" />
@@ -2170,5 +2170,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Windmill" icon="presets/windmill.png">
+        <item name="Windmill" icon="presets/windmill.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
             <label text="Edit Windmill" />
@@ -2176,5 +2176,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Pipeline" icon="presets/empty.png">
+        <item name="Pipeline" icon="presets/empty.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
             <label text="Edit Pipeline" />
@@ -2182,5 +2182,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Wastewater Plant" icon="presets/wastewater_plant.png">
+        <item name="Wastewater Plant" icon="presets/wastewater_plant.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
@@ -2190,5 +2190,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Crane" icon="presets/crane.png">
+        <item name="Crane" icon="presets/crane.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
             <label text="Edit Crane" />
@@ -2196,5 +2196,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Beacon" icon="presets/empty.png">
+        <item name="Beacon" icon="presets/empty.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
             <label text="Edit Beacon" />
@@ -2202,5 +2202,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Survey Point" icon="presets/survey_point.png">
+        <item name="Survey Point" icon="presets/survey_point.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
             <label text="Edit Survey Point" />
@@ -2208,5 +2208,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Surveillance" icon="presets/surveillance.png">
+        <item name="Surveillance" icon="presets/surveillance.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
             <label text="Edit Surveillance Camera" />
@@ -2215,5 +2215,5 @@
         </item>
         <separator/>
-        <item name="Power Generator" icon="presets/power.png">
+        <item name="Power Generator" icon="presets/power.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
@@ -2224,5 +2224,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Power Station" icon="presets/power.png">
+        <item name="Power Station" icon="presets/power.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
@@ -2231,5 +2231,5 @@
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
         </item>
-        <item name="Power Sub Station" icon="presets/power.png">
+        <item name="Power Sub Station" icon="presets/power.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
@@ -2239,5 +2239,5 @@
             <text key="ref" text="Line reference" default="" delete_if_empty="true" />
         </item>
-        <item name="Power Tower" icon="presets/power_tower.png">
+        <item name="Power Tower" icon="presets/power_tower.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=tower"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=tower"
@@ -2247,5 +2247,5 @@
             <key key="power" value="tower" />
         </item>
-        <item name="Power Line" icon="presets/power.png">
+        <item name="Power Line" icon="presets/power.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
@@ -2259,5 +2259,5 @@
     </group> <!-- Man Made -->
     <group name="Amenities" icon="presets/telephone.png">
-        <item name="Toilets" icon="presets/toilet.png">
+        <item name="Toilets" icon="presets/toilet.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=toilets"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=toilets" />
@@ -2268,10 +2268,10 @@
             <text key="note" text="Note" default="" delete_if_empty="true" />
         </item>
-        <item name="Post Box" icon="presets/letter.png">
+        <item name="Post Box" icon="presets/letter.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box" />
             <key key="amenity" value="post_box" />
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
         </item>
-        <item name="Telephone" icon="presets/telephone.png">
+        <item name="Telephone" icon="presets/telephone.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
@@ -2286,5 +2286,5 @@
             <check key="payment:telephone_cards" text="Telephone cards" default="off" delete_if_empty="true" />
         </item>
-        <item name="Recycling" icon="presets/recycling.png">
+        <item name="Recycling" icon="presets/recycling.png" type="node,way,closedway">
            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
@@ -2298,9 +2298,9 @@
             <check key="recycling:scrap_metal" text="Scrap Metal" default="off" delete_if_empty="true" />
         </item>
-        <item name="Bench" icon="presets/bench.png">
+        <item name="Bench" icon="presets/bench.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
             <key key="amenity" value="bench" />
         </item>
-        <item name="Hunting Stand" icon="presets/hunting_stand.png">
+        <item name="Hunting Stand" icon="presets/hunting_stand.png" type="node,way,closedway">
             <label text="Edit a Hunting Stand" />
             <key key="amenity" value="hunting_stand" />
@@ -2310,5 +2310,5 @@
             <combo key="height" text="Height" values="low,half,full,5,10,15,20" default="" delete_if_empty="true" />
         </item>
-        <item name="Fountain" icon="presets/spring.png">
+        <item name="Fountain" icon="presets/spring.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
@@ -2317,5 +2317,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Drinking Water" icon="presets/drinking_water.png">
+        <item name="Drinking Water" icon="presets/drinking_water.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
@@ -2324,5 +2324,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Baby Hatch" icon="presets/empty.png">
+        <item name="Baby Hatch" icon="presets/empty.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
             <label text="Edit a Baby Hatch" />
@@ -2333,10 +2333,10 @@
     </group> <!-- Amenities -->
     <group name="Shops" icon="presets/shopping.png">
-        <item name="Supermarket" icon="presets/shopping.png">
+        <item name="Supermarket" icon="presets/shopping.png" type="node,way,closedway">
             <label text="Edit Supermarket" />
             <key key="shop" value="supermarket" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Convenience Store" icon="presets/empty.png">
+        <item name="Convenience Store" icon="presets/empty.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
             <label text="Edit Convenience Store" />
@@ -2344,5 +2344,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Kiosk" icon="presets/kiosk.png">
+        <item name="Kiosk" icon="presets/kiosk.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
             <label text="Edit Kiosk" />
@@ -2350,5 +2350,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Vending machine" icon="presets/vending_machine.png">
+        <item name="Vending machine" icon="presets/vending_machine.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
             <label text="Edit a Vending_machine" />
@@ -2365,5 +2365,5 @@
             <check key="payment:account_cards" text="Account or loyalty cards" default="off" delete_if_empty="true" />
         </item>
-        <item name="Butcher" icon="presets/cow.png">
+        <item name="Butcher" icon="presets/cow.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
             <label text="Edit Butcher" />
@@ -2371,5 +2371,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Baker" icon="presets/baker.png">
+        <item name="Baker" icon="presets/baker.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
             <label text="Edit Baker" />
@@ -2377,5 +2377,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item> 
-        <item name="Florist" icon="presets/empty.png">
+        <item name="Florist" icon="presets/empty.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
             <label text="Edit Florist" />
@@ -2383,35 +2383,35 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Organic" icon="presets/empty.png">
+        <item name="Organic" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Organic Shop" />
             <key key="shop" value="organic" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Beverages" icon="presets/empty.png">
+        <item name="Beverages" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Beverages  Shop" />
             <key key="shop" value="beverages" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Computer" icon="presets/empty.png">
+        <item name="Computer" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Computer Shop" />
             <key key="shop" value="computer" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Electronics" icon="presets/empty.png">
+        <item name="Electronics" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Electronics Shop" />
             <key key="shop" value="electronics" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Hifi" icon="presets/empty.png">
+        <item name="Hifi" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Hifi Shop" />
             <key key="shop" value="hifi" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Furniture" icon="presets/empty.png">
+        <item name="Furniture" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Furniture Shop" />
             <key key="shop" value="furniture" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Garden Centre" icon="presets/empty.png">
+        <item name="Garden Centre" icon="presets/empty.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
             <label text="Edit Garden Centre" />
@@ -2419,5 +2419,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Hardware" icon="presets/empty.png">
+        <item name="Hardware" icon="presets/empty.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
             <label text="Edit Hardware Store" />
@@ -2425,5 +2425,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Do-it-yourself-store" icon="presets/diy_store.png">
+        <item name="Do-it-yourself-store" icon="presets/diy_store.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
             <label text="Edit Do-it-yourself-store" />
@@ -2431,30 +2431,30 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Stationery" icon="presets/empty.png">
+        <item name="Stationery" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Stationery Shop" />
             <key key="shop" value="stationery" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Hairdresser" icon="presets/empty.png">
+        <item name="Hairdresser" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Hairdresser" />
             <key key="shop" value="hairdresser" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Shoes" icon="presets/empty.png">
+        <item name="Shoes" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Shoe Shop" />
             <key key="shop" value="shoes" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Toys" icon="presets/empty.png">
+        <item name="Toys" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Toy Shop" />
             <key key="shop" value="toys" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Video" icon="presets/empty.png">
+        <item name="Video" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Video Shop" />
             <key key="shop" value="video" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Dry Cleaning" icon="presets/laundry.png">
+        <item name="Dry Cleaning" icon="presets/laundry.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
             <label text="Edit Dry Cleaning" />
@@ -2462,5 +2462,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Laundry" icon="presets/laundry.png">
+        <item name="Laundry" icon="presets/laundry.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
             <label text="Edit Laundry" />
@@ -2468,5 +2468,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Outdoor" icon="presets/tent.png">
+        <item name="Outdoor" icon="presets/tent.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
             <label text="Edit Outdoor Shop" />
@@ -2474,10 +2474,10 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>    
-        <item name="sports" icon="presets/empty.png">
+        <item name="sports" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Sports Shop" />
             <key key="shop" value="sports" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="optician" icon="presets/empty.png">
+        <item name="optician" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Optician" />
             <key key="shop" value="optician" />
@@ -2487,5 +2487,5 @@
     </group> <!-- Shops -->
     <group name="Cash" icon="presets/dollar.png">
-        <item name="Bank" icon="presets/bank.png">
+        <item name="Bank" icon="presets/bank.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
             <label text="Edit Bank" />
@@ -2494,5 +2494,5 @@
             <check key="atm" text="Automated Teller Machine" default="on" delete_if_empty="true" />
         </item>
-        <item name="Money Exchange" icon="presets/coins.png">
+        <item name="Money Exchange" icon="presets/coins.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
             <label text="Edit Money Exchange" />
@@ -2500,5 +2500,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Automated Teller Machine" icon="presets/cash.png">
+        <item name="Automated Teller Machine" icon="presets/cash.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
             <label text="Edit Automated Teller Machine" />
@@ -2508,5 +2508,5 @@
     </group> <!-- Cash -->
     <group name="Health" icon="presets/pharmacy.png">
-        <item name="Doctors" icon="presets/empty.png">
+        <item name="Doctors" icon="presets/empty.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
             <label text="Edit Doctors" />
@@ -2514,10 +2514,10 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Dentist" icon="presets/empty.png">
+        <item name="Dentist" icon="presets/empty.png" type="node,way,closedway">
             <label text="Edit Dentist" />
             <key key="amenity" value="dentist" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Pharmacy" icon="presets/pharmacy.png">
+        <item name="Pharmacy" icon="presets/pharmacy.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
             <label text="Edit Pharmacy" />
@@ -2526,5 +2526,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Hospital" icon="presets/hospital.png">
+        <item name="Hospital" icon="presets/hospital.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
             <label text="Edit Hospital" />
@@ -2532,5 +2532,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Emergency Access Point" icon="presets/emergency_access_point.png">
+        <item name="Emergency Access Point" icon="presets/emergency_access_point.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
@@ -2543,5 +2543,5 @@
             <space />
         </item>
-        <item name="Veterinary" icon="presets/empty.png">
+        <item name="Veterinary" icon="presets/empty.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
@@ -2553,5 +2553,5 @@
     <separator/>
     <group name="Places" icon="presets/places.png">
-        <item name="Continent" icon="presets/places.png">
+        <item name="Continent" icon="presets/places.png" type="node,way,closedway">
             <label text="Edit a Continent" />
             <space />
@@ -2559,5 +2559,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Country" icon="presets/places.png">
+        <item name="Country" icon="presets/places.png" type="node,way,closedway">
             <label text="Edit Country" />
             <space />
@@ -2565,5 +2565,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="State" icon="presets/places.png">
+        <item name="State" icon="presets/places.png" type="node,way,closedway">
             <label text="Edit State" />
             <space />
@@ -2571,5 +2571,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Region" icon="presets/places.png">
+        <item name="Region" icon="presets/places.png" type="node,way,closedway">
             <label text="Edit Region" />
             <space />
@@ -2577,5 +2577,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="County" icon="presets/places.png">
+        <item name="County" icon="presets/places.png" type="node,way,closedway">
             <label text="Edit County" />
             <space />
@@ -2583,5 +2583,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="City" icon="presets/places.png">
+        <item name="City" icon="presets/places.png" type="node,way,closedway">
             <label text="Edit City" />
             <space />
@@ -2589,5 +2589,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Town" icon="presets/places.png">
+        <item name="Town" icon="presets/places.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
             <label text="Edit Town" />
@@ -2596,5 +2596,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Suburb" icon="presets/places.png">
+        <item name="Suburb" icon="presets/places.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
             <label text="Edit Suburb" />
@@ -2603,5 +2603,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Village" icon="presets/places.png">
+        <item name="Village" icon="presets/places.png" type="node,way,closedway">
             <label text="Edit Village" />
             <space />
@@ -2609,5 +2609,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Hamlet" icon="presets/places.png">
+        <item name="Hamlet" icon="presets/places.png" type="node,way,closedway">
             <label text="Edit Hamlet" />
             <space />
@@ -2615,5 +2615,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Locality" icon="presets/locality.png">
+        <item name="Locality" icon="presets/locality.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
             <label text="Edit Locality" />
@@ -2622,5 +2622,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Island" icon="presets/island.png">
+        <item name="Island" icon="presets/island.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
             <label text="Edit Island" />
@@ -2630,5 +2630,5 @@
         </item>
         <separator/>
-        <item name="Cave Entrance" icon="presets/empty.png">
+        <item name="Cave Entrance" icon="presets/empty.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
             <label text="Edit Cave Entrance" />
@@ -2636,5 +2636,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Peak" icon="presets/peak.png">
+        <item name="Peak" icon="presets/peak.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
             <label text="Edit Peak" />
@@ -2643,5 +2643,5 @@
             <text key="ele" text="Elevation" default="" delete_if_empty="true" />
         </item>
-        <item name="Glacier" icon="presets/glacier.png">
+        <item name="Glacier" icon="presets/glacier.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
             <label text="Edit Glacier" />
@@ -2650,5 +2650,5 @@
             <text key="ele" text="Elevation" default="" delete_if_empty="true" />
         </item>
-        <item name="Volcano" icon="presets/volcano.png">
+        <item name="Volcano" icon="presets/volcano.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
             <label text="Edit Volcano" />
@@ -2659,5 +2659,5 @@
     </group> <!-- Places -->
     <group name="Boundaries" icon="presets/boundaries.png">
-        <item name="National" icon="presets/boundaries.png">
+        <item name="National" icon="presets/boundaries.png" type="node,way,closedway">
             <label text="Edit National Boundary" />
             <space />
@@ -2665,5 +2665,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Administrative" icon="presets/boundaries.png">
+        <item name="Administrative" icon="presets/boundaries.png" type="node,way,closedway">
             <label text="Edit Administrative Boundary" />
             <space />
@@ -2671,5 +2671,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Civil" icon="presets/boundaries.png">
+        <item name="Civil" icon="presets/boundaries.png" type="node,way,closedway">
             <label text="Edit Civil Boundary" />
             <space />
@@ -2677,5 +2677,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="political" icon="presets/boundaries.png">
+        <item name="political" icon="presets/boundaries.png" type="node,way,closedway">
             <label text="Edit Political Boundary" />
             <space />
@@ -2683,5 +2683,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="National_park" icon="presets/boundaries.png">
+        <item name="National_park" icon="presets/boundaries.png" type="node,way,closedway">
             <label text="Edit National Park Boundary" />
             <space />
@@ -2691,5 +2691,5 @@
     </group> <!-- Boundaries -->
     <group name="Land use" icon="presets/landuse.png">
-      <item name="Tree" icon="presets/tree.png">
+      <item name="Tree" icon="presets/tree.png" type="node,way,closedway">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
               fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
@@ -2701,5 +2701,5 @@
         <text key="name:botanical" text="Botanical Name" default="" delete_if_empty="true" />
       </item>
-      <item name="Wood" icon="presets/landuse.png">
+      <item name="Wood" icon="presets/landuse.png" type="node,way,closedway">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
                 de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
@@ -2709,5 +2709,5 @@
           <combo key="wood" text="Type" values="coniferous,deciduous,mixed" default="" delete_if_empty="true" />
         </item>
-        <item name="Forest" icon="presets/landuse.png">
+        <item name="Forest" icon="presets/landuse.png" type="node,way,closedway">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
                 de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
@@ -2718,10 +2718,10 @@
           <combo key="wood" text="Type" values="coniferous,deciduous,mixed" default="" delete_if_empty="true" />
         </item>
-        <item name="Nature Reserve" icon="presets/empty.png">
+        <item name="Nature Reserve" icon="presets/empty.png" type="node,way,closedway">
           <label text="Edit Nature Reserve" />
           <key key="leisure" value="nature_reserve" />
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Farmyard" icon="presets/landuse.png">
+        <item name="Farmyard" icon="presets/landuse.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
@@ -2731,5 +2731,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Farmland" icon="presets/landuse.png">
+        <item name="Farmland" icon="presets/landuse.png" type="node,way,closedway">
             <label text="Edit Farmland Landuse" />
             <space />
@@ -2737,5 +2737,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Meadow" icon="presets/landuse.png">
+        <item name="Meadow" icon="presets/landuse.png" type="node,way,closedway">
           <label text="Edit Meadow Landuse" />
           <space />
@@ -2743,5 +2743,5 @@
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Vineyard" icon="presets/fruits.png">
+        <item name="Vineyard" icon="presets/fruits.png" type="node,way,closedway">
           <label text="Edit Vineyard Landuse" />
           <space />
@@ -2749,5 +2749,5 @@
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Allotments" icon="presets/landuse.png">
+        <item name="Allotments" icon="presets/landuse.png" type="node,way,closedway">
           <label text="Edit Allotments Landuse" />
           <space />
@@ -2755,10 +2755,10 @@
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Garden" icon="presets/empty.png">
+        <item name="Garden" icon="presets/empty.png" type="node,way,closedway">
           <label text="Edit Garden" />
           <key key="leisure" value="garden" />
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Grass" icon="presets/landuse.png">
+        <item name="Grass" icon="presets/landuse.png" type="node,way,closedway">
           <label text="Edit Grass Landuse" />
           <space />
@@ -2766,5 +2766,5 @@
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Village Green" icon="presets/landuse.png">
+        <item name="Village Green" icon="presets/landuse.png" type="node,way,closedway">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
           <label text="Edit Village Green Landuse" />
@@ -2773,5 +2773,5 @@
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Common" icon="presets/empty.png">
+        <item name="Common" icon="presets/empty.png" type="node,way,closedway">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
           <label text="Edit Common" />
@@ -2779,10 +2779,10 @@
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Park" icon="presets/empty.png">
+        <item name="Park" icon="presets/empty.png" type="node,way,closedway">
           <label text="Edit Park" />
           <key key="leisure" value="park" />
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Recreation Ground" icon="presets/landuse.png">
+        <item name="Recreation Ground" icon="presets/landuse.png" type="node,way,closedway">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
           <label text="Edit Recreation Ground Landuse" />
@@ -2792,5 +2792,5 @@
         </item>
         <separator/>
-        <item name="Residential area" icon="presets/landuse.png">
+        <item name="Residential area" icon="presets/landuse.png" type="node,way,closedway">
             <label text="Edit Residential Landuse" />
             <space />
@@ -2798,5 +2798,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Graveyard" icon="presets/graveyard.png">
+        <item name="Graveyard" icon="presets/graveyard.png" type="node,way,closedway">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
           <label text="Edit Graveyard" />
@@ -2806,5 +2806,5 @@
           <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" default="" delete_if_empty="true" />
         </item>
-        <item name="Cemetery" icon="presets/cemetery.png">
+        <item name="Cemetery" icon="presets/cemetery.png" type="node,way,closedway">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
           <label text="Edit Cemetery Landuse" />
@@ -2815,5 +2815,5 @@
           <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" default="" delete_if_empty="true" />
         </item>
-        <item name="Retail" icon="presets/landuse.png">
+        <item name="Retail" icon="presets/landuse.png" type="node,way,closedway">
             <label text="Edit Retail Landuse" />
             <space />
@@ -2821,5 +2821,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Commercial" icon="presets/landuse.png">
+        <item name="Commercial" icon="presets/landuse.png" type="node,way,closedway">
             <label text="Edit Commercial Landuse" />
             <space />
@@ -2827,5 +2827,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Industrial" icon="presets/works.png">
+        <item name="Industrial" icon="presets/works.png" type="node,way,closedway">
             <label text="Edit Industrial Landuse" />
             <space />
@@ -2833,5 +2833,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Railway land" icon="presets/rail_light.png">
+        <item name="Railway land" icon="presets/rail_light.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
             <label text="Edit Railway Landuse" />
@@ -2841,5 +2841,5 @@
         </item>
         <separator/>
-        <item name="Brownfield" icon="presets/landuse.png">
+        <item name="Brownfield" icon="presets/landuse.png" type="node,way,closedway">
           <label text="Edit Brownfield Landuse" />
           <space />
@@ -2847,5 +2847,5 @@
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Greenfield" icon="presets/landuse.png">
+        <item name="Greenfield" icon="presets/landuse.png" type="node,way,closedway">
           <label text="Edit Greenfield Landuse" />
           <space />
@@ -2853,5 +2853,5 @@
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Construction area" icon="presets/construction.png">
+        <item name="Construction area" icon="presets/construction.png" type="node,way,closedway">
             <label text="Edit Construction Landuse" />
             <space />
@@ -2859,5 +2859,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Landfill" icon="presets/landuse.png">
+        <item name="Landfill" icon="presets/landuse.png" type="node,way,closedway">
           <label text="Edit Landfill Landuse" />
           <space />
@@ -2865,5 +2865,5 @@
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Quarry" icon="presets/mine.png">
+        <item name="Quarry" icon="presets/mine.png" type="node,way,closedway">
           <label text="Edit Quarry Landuse" />
           <space />
@@ -2871,5 +2871,5 @@
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Military" icon="presets/military.png">
+        <item name="Military" icon="presets/military.png" type="node,way,closedway">
             <label text="Edit Military Landuse" />
             <space />
@@ -2878,15 +2878,15 @@
         </item>
         <separator/>
-        <item name="Scree" icon="presets/empty.png">
+        <item name="Scree" icon="presets/empty.png" type="node,way,closedway">
           <label text="Edit Scree" />
           <key key="natural" value="scree" />
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Scrub" icon="presets/empty.png">
+        <item name="Scrub" icon="presets/empty.png" type="node,way,closedway">
           <label text="Edit Scrub" />
           <key key="natural" value="scrub" />
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Fell" icon="presets/empty.png">
+        <item name="Fell" icon="presets/empty.png" type="node,way,closedway">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
           <label text="Edit Fell" />
@@ -2894,5 +2894,5 @@
           <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Heath" icon="presets/empty.png">
+        <item name="Heath" icon="presets/empty.png" type="node,way,closedway">
           <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
           <label text="Edit Heath" />