Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 1490)
+++ trunk/presets/presets.xml	(revision 1491)
@@ -457,5 +457,5 @@
             </optional>
         </item>
-        <item name="Pedestrian" icon="presets/pedestrian.png" type="way,closedway">
+        <item name="Pedestrian" icon="presets/pedestrian.png" type="way,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
@@ -737,5 +737,5 @@
             <text key="ref" text="Number" default="" delete_if_empty="true" />
         </item>
-        <item name="Services" icon="presets/car_service.png" type="node,closedway">
+        <item name="Services" icon="presets/car_service.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
             <label text="Edit Service Station" />
@@ -799,9 +799,9 @@
             <key key="amenity" value="emergency_phone" />
         </item>
-        <item name="Incline" icon="presets/incline.png" type="node">
-          <key key="highway" value="incline" />
-        </item>
-        <item name="Incline Steep" icon="presets/incline_steep.png" type="node">
-          <key key="highway" value="incline_steep" />
+        <item name="Incline" icon="presets/incline.png" type="node,way">
+            <key key="highway" value="incline" />
+        </item>
+        <item name="Incline Steep" icon="presets/incline_steep.png" type="node,way">
+            <key key="highway" value="incline_steep" />
         </item>
         <separator/>
@@ -814,5 +814,5 @@
             </optional>
         </item>
-        <item name="Mountain Pass" icon="presets/mountain_pass.png" type="node,way,closedway">
+        <item name="Mountain Pass" icon="presets/mountain_pass.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
             <label text="Edit Mountain Pass" />
@@ -826,5 +826,5 @@
     </group> <!-- Waypoints -->
     <group name="Barriers" icon="presets/barrier.png">
-        <item name="Stile" icon="presets/stile.png" type="node,way,closedway">
+        <item name="Stile" icon="presets/stile.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
             <label text="Edit Stile" />
@@ -836,5 +836,5 @@
             <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
         </item> <!-- stile -->
-        <item name="Kissing Gate" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Kissing Gate" icon="presets/empty.png" type="node">
             <label text="Edit Kissing Gate" />
             <space />
@@ -845,5 +845,5 @@
             <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
         </item> <!-- kissing_gate -->
-        <item name="Hampshire Gate" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Hampshire Gate" icon="presets/empty.png" type="node">
             <label text="Edit Hampshire Gate" />
             <space />
@@ -857,5 +857,5 @@
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- hampshire_gate -->
-        <item name="Bollard" icon="presets/bollard.png" type="node,way,closedway">
+        <item name="Bollard" icon="presets/bollard.png" type="node,way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
             <label text="Edit Bollard" />
@@ -869,5 +869,5 @@
             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
         </item> <!-- bollard -->
-        <item name="Drawbridge" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Drawbridge" icon="presets/empty.png" type="node">
             <label text="Edit Drawbridge" />
             <space />
@@ -881,8 +881,8 @@
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- drawbridge -->
-        <item name="Bus Trap" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Bus Trap" icon="presets/empty.png" type="node">
             <key key="barrier" value="bus_trap" />
         </item> <!-- bus_trap -->
-        <item name="Cattle Grid" icon="presets/cattle_grid.png" type="node,way,closedway">
+        <item name="Cattle Grid" icon="presets/cattle_grid.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
             <label text="Edit Cattle Grid" />
@@ -896,5 +896,5 @@
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- cattle_grid -->
-        <item name="Spikes" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Spikes" icon="presets/empty.png" type="node">
             <label text="Edit Spikes" />
             <space />
@@ -908,5 +908,5 @@
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- spikes -->
-        <item name="Portcullis" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Portcullis" icon="presets/empty.png" type="node">
             <label text="Edit Portcullis" />
             <space />
@@ -918,5 +918,5 @@
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- portcullis -->
-        <item name="Gate" icon="presets/gate.png" type="node,way,closedway">
+        <item name="Gate" icon="presets/gate.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
             <label text="Edit Gate" />
@@ -931,5 +931,5 @@
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- gate -->
-        <item name="Lift Gate" icon="presets/lift_gate.png" type="node,way,closedway">
+        <item name="Lift Gate" icon="presets/lift_gate.png" type="node">
             <label text="Edit Lift Gate" />
             <space />
@@ -943,5 +943,5 @@
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- lift_gate -->
-        <item name="Sally Port" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Sally Port" icon="presets/empty.png" type="node">
             <label text="Edit Sally Port" />
             <space />
@@ -955,5 +955,5 @@
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- sally_port -->
-        <item name="Bump Gate" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Bump Gate" icon="presets/empty.png" type="node">
             <label text="Edit Bump Gate" />
             <space />
@@ -971,9 +971,9 @@
             <key key="barrier" value="cycle_barrier" />
         </item> <!-- bump_gate -->
-        <item name="Hedge" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Hedge" icon="presets/empty.png" type="way,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
             <key key="barrier" value="hedge" />
         </item> <!-- hedge -->
-        <item name="Fence" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Fence" icon="presets/empty.png" type="way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
             <key key="barrier" value="fence" />
@@ -982,16 +982,16 @@
             <key key="barrier" value="block" />
         </item> <!-- block -->
-        <item name="Wall" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Wall" icon="presets/empty.png" type="way,closedway">
             <key key="barrier" value="wall" />
         </item> <!-- wall -->
-        <item name="City Wall" icon="presets/empty.png" type="node,way,closedway">
+        <item name="City Wall" icon="presets/empty.png" type="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" type="node,way,closedway">
+        <item name="Retaining Wall" icon="presets/empty.png" type="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" type="node,way,closedway">
+        <item name="Toll Booth" icon="presets/toll_station.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
             <label text="Edit Toll Booth" />
@@ -1003,5 +1003,5 @@
             </optional>
         </item> <!-- toll_booth -->
-        <item name="Border Control" icon="presets/douane.png" type="node,way,closedway">
+        <item name="Border Control" icon="presets/douane.png" type="node">
             <label text="Edit Border Control" />
             <space />
@@ -1016,5 +1016,5 @@
         </item> <!-- border_control -->
         <separator/>
-        <item name="Entrance" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Entrance" icon="presets/empty.png" type="node">
             <label text="Edit Entrance" />
             <space />
@@ -1031,36 +1031,36 @@
     <separator/>
     <group name="Water" icon="presets/waterway.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 Spring" />
-        <key key="natural" value="spring" />
-        <text key="name" text="Name" default="" delete_if_empty="true" />
-      </item>
-      <separator/>
-      <item name="Drain" icon="presets/waterway.png" type="node,way,closedway">
-        <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-        <label text="Edit Drain" />
-        <space />
-        <key key="waterway" value="drain" />
-        <text key="name" text="Name" default="" delete_if_empty="true" />
-        <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" type="node,way,closedway">
-        <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-        <label text="Edit Stream" />
-        <space />
-        <key key="waterway" value="stream" />
-        <text key="name" text="Name" default="" delete_if_empty="true" />
-        <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" type="node,way,closedway">
-        <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-        <label text="Edit Canal" />
-        <space />
-        <key key="waterway" value="canal" />
-        <text key="name" text="Name" default="" delete_if_empty="true" />
-        <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" type="node,way,closedway">
+        <item name="Spring" icon="presets/spring.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+            <label text="Edit Spring" />
+            <key key="natural" value="spring" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <separator/>
+        <item name="Drain" icon="presets/waterway.png" type="way">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
+            <label text="Edit Drain" />
+            <space />
+            <key key="waterway" value="drain" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <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" type="way">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
+            <label text="Edit Stream" />
+            <space />
+            <key key="waterway" value="stream" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <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" type="way">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
+            <label text="Edit Canal" />
+            <space />
+            <key key="waterway" value="canal" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <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" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=river"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
@@ -1073,120 +1073,120 @@
         </item>
         <separator/>
-        <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" />
-          <key key="natural" value="water" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Land" icon="presets/landuse.png" type="node,way,closedway">
-          <label text="Edit Land" />
-          <key key="natural" value="land" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
+        <item name="Water" icon="presets/water.png" type="node,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
+            <label text="Edit Water" />
+            <key key="natural" value="water" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Land" icon="presets/landuse.png" type="node,closedway,relation">
+            <label text="Edit Land" />
+            <key key="natural" value="land" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
         <separator/>
-        <item name="Basin" icon="presets/landuse_water.png" type="node,way,closedway">
-          <label text="Edit Basin Landuse" />
-          <space />
-          <key key="landuse" value="basin" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <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" />
-          <space />
-          <key key="landuse" value="reservoir" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <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" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
+        <item name="Basin" icon="presets/landuse_water.png" type="node,closedway,relation">
+            <label text="Edit Basin Landuse" />
+            <space />
+            <key key="landuse" value="basin" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Reservoir" icon="presets/landuse_water.png" type="node,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+            <label text="Edit Reservoir Landuse" />
+            <space />
+            <key key="landuse" value="reservoir" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Covered Reservoir" icon="presets/reservoir_covered.png" type="node,closedway,relation">
+            <label text="Edit Covered Reservoir" />
+            <key key="man_made" value="reservoir_covered" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
         <separator/>
-        <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" />
-          <label text="Edit Riverbank" />
-          <key key="waterway" value="riverbank" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <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"
-                pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
-                pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-          <label text="Edit Wetland" />
-          <key key="natural" value="wetland" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-          <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" 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" type="node,way,closedway">
-          <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-          <label text="Edit Beach" />
-          <key key="natural" value="beach" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <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" type="node,way,closedway">
-          <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-          <label text="Edit Cliff" />
-          <key key="natural" value="cliff" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <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" />
-          <key key="natural" value="coastline" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
+        <item name="Riverbank" icon="presets/waterway.png" type="closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
+            <label text="Edit Riverbank" />
+            <key key="waterway" value="riverbank" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Wetland" icon="presets/empty.png" type="node,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wetland"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
+            <label text="Edit Wetland" />
+            <key key="natural" value="wetland" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <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" type="node,closedway,relation">
+            <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" type="node,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
+            <label text="Edit Beach" />
+            <key key="natural" value="beach" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Bay" icon="presets/empty.png" type="node,closedway,relation">
+            <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" type="node,way,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
+            <label text="Edit Cliff" />
+            <key key="natural" value="cliff" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Coastline" icon="presets/empty.png" type="node,way,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+            <label text="Edit Coastline" />
+            <key key="natural" value="coastline" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
         <separator/>
-        <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 Ferry" />
-          <space />
-          <key key="route" value="ferry" />
-          <optional>
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-          </optional>
+        <item name="Ferry Route" icon="presets/ferry.png" type="way,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
+            <label text="Edit Ferry" />
+            <space />
+            <key key="route" value="ferry" />
+            <optional>
+              <text key="name" text="Name" default="" delete_if_empty="true" />
+            </optional>
         </item>
         <separator/>
-        <item name="Boatyard" icon="presets/boatyard.png" type="node,way,closedway">
-          <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-          <label text="Edit Boatyard" />
-          <space />
-          <key key="waterway" value="boatyard" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Dock" icon="presets/waterway.png" type="node,way,closedway">
-          <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-          <label text="Edit Dock" />
-          <space />
-          <key key="waterway" value="dock" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
+        <item name="Boatyard" icon="presets/boatyard.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
+            <label text="Edit Boatyard" />
+            <space />
+            <key key="waterway" value="boatyard" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Dock" icon="presets/waterway.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+            <label text="Edit Dock" />
+            <space />
+            <key key="waterway" value="dock" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
         <separator/>
-        <item name="Dam" icon="presets/empty.png" type="node,way,closedway">
-          <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-          <label text="Edit Dam" />
-          <space />
-          <key key="waterway" value="dam" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
+        <item name="Dam" icon="presets/empty.png" type="way,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+            <label text="Edit Dam" />
+            <space />
+            <key key="waterway" value="dam" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
       </group> <!-- Water -->
     <group name="Waterway Point" icon="presets/waterwaypoint.png">
-        <item name="Lock Gate" icon="presets/lock_gate.png" type="node,way,closedway">
+        <item name="Lock Gate" icon="presets/lock_gate.png" type="node">
             <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" type="node,way,closedway">
+        <item name="Weir" icon="presets/weir.png" type="node,way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
             <label text="Edit Weir" />
@@ -1195,5 +1195,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Waterfall" icon="presets/waterfall.png" type="node,way,closedway">
+        <item name="Waterfall" icon="presets/waterfall.png" type="node,way">
             <label text="Edit Waterfall" />
             <space />
@@ -1201,14 +1201,14 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Turning Point" icon="presets/turning.png" type="node,way,closedway">
+        <item name="Turning Point" icon="presets/turning.png" type="node">
             <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" type="node,way,closedway">
+        <item name="Marina" icon="presets/marina.png" type="node,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" type="node,way,closedway">
+        <item name="Pier" icon="presets/pier.png" type="way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
             <label text="Edit Pier" />
@@ -1216,5 +1216,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Ferry Terminal" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Ferry Terminal" icon="presets/empty.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
             <label text="Edit Ferry Terminal" />
@@ -1222,5 +1222,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Slipway" icon="presets/slipway.png" type="node,way,closedway">
+        <item name="Slipway" icon="presets/slipway.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -1233,5 +1233,5 @@
     <separator/>
     <group name="Railway" icon="presets/railway.png">
-        <item name="Rail" icon="presets/railway.png" type="node,way,closedway">
+        <item name="Rail" icon="presets/railway.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
             <label text="Edit Rail" />
@@ -1240,5 +1240,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" type="node,way,closedway">
+        <item name="Narrow Gauge Rail" icon="presets/railway.png" type="way">
             <label text="Edit Narrow Gauge Rail" />
             <space />
@@ -1246,5 +1246,5 @@
             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
         </item>
-        <item name="Monorail" icon="presets/railway.png" type="node,way,closedway">
+        <item name="Monorail" icon="presets/railway.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
             <label text="Edit Monorail" />
@@ -1253,5 +1253,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" type="node,way,closedway">
+        <item name="Preserved" icon="presets/rail_preserved.png" type="way">
             <label text="Edit Preserved Railway" />
             <space />
@@ -1259,5 +1259,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" type="node,way,closedway">
+        <item name="Light Rail" icon="presets/rail_light.png" type="way">
             <label text="Edit Light Rail" />
             <space />
@@ -1265,5 +1265,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" type="node,way,closedway">
+        <item name="Subway" icon="presets/rail_light.png" type="way">
             <label text="Edit Subway" />
             <space />
@@ -1271,5 +1271,5 @@
             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
         </item>
-        <item name="Tram" icon="presets/tram.png" type="node,way,closedway">
+        <item name="Tram" icon="presets/tram.png" type="way">
             <label text="Edit Tram" />
             <space />
@@ -1277,5 +1277,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" type="node,way,closedway">
+        <item name="Bus Guideway" icon="presets/busway.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
             <label text="Edit Bus Guideway" />
@@ -1296,5 +1296,5 @@
         </item>
         <separator/>
-        <item name="Disused Rail" icon="presets/railway.png" type="node,way,closedway">
+        <item name="Disused Rail" icon="presets/railway.png" type="way">
             <label text="Edit Disused Railway" />
             <space />
@@ -1302,13 +1302,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" type="node,way,closedway">
+        <item name="Abandoned Rail" icon="presets/railway.png" type="way">
             <key key="railway" value="abandoned" />
         </item>
         <separator/>
-        <item name="Level Crossing" icon="presets/level_crossing.png" type="node,way,closedway">
+        <item name="Level Crossing" icon="presets/level_crossing.png" type="node">
             <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" type="node,way,closedway">
+        <item name="Crossing" icon="presets/crossing.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Key:crossing" />
             <key key="railway" value="crossing" />
@@ -1320,5 +1320,5 @@
             </optional>
         </item>
-        <item name="Turntable" icon="presets/turntable.png" type="node,way,closedway">
+        <item name="Turntable" icon="presets/turntable.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
             <key key="railway" value="turntable" />
@@ -1326,5 +1326,5 @@
     </group> <!-- Railway -->
     <group name="Aerialway" icon="presets/aerialway.png">
-        <item name="Chair Lift" icon="presets/chair_lift.png" type="node,way,closedway">
+        <item name="Chair Lift" icon="presets/chair_lift.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
             <label text="Edit Chair Lift" />
@@ -1332,5 +1332,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Drag Lift" icon="presets/drag_lift.png" type="node,way,closedway">
+        <item name="Drag Lift" icon="presets/drag_lift.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
             <label text="Edit Drag Lift" />
@@ -1338,5 +1338,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Cable Car" icon="presets/cable_car.png" type="node,way,closedway">
+        <item name="Cable Car" icon="presets/cable_car.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
             <label text="Edit Cable Car" />
@@ -1344,5 +1344,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Station" icon="presets/aerialway_station.png" type="node,way,closedway">
+        <item name="Station" icon="presets/aerialway_station.png" type="node,closedway">
             <label text="Edit Station" />
             <key key="aerialway" value="station" />
@@ -1352,5 +1352,5 @@
     <separator/>
     <group name="Car" icon="presets/car.png">
-        <item name="Fuel" icon="presets/fuel.png" type="node,way,closedway">
+        <item name="Fuel" icon="presets/fuel.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
@@ -1361,5 +1361,5 @@
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
         </item>
-        <item name="Parking" icon="presets/parking.png" type="node,way,closedway">
+        <item name="Parking" icon="presets/parking.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
@@ -1372,5 +1372,5 @@
             <check key="fee" text="Fee" default="off" delete_if_empty="true" />
         </item>
-        <item name="Wash" icon="presets/car_wash.png" type="node,way,closedway">
+        <item name="Wash" icon="presets/car_wash.png" type="node,closedway">
             <label text="Edit Car Wash" />
             <key key="amenity" value="car_wash" />
@@ -1378,5 +1378,5 @@
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
         </item>
-        <item name="Shop" icon="presets/car_repair.png" type="node,way,closedway">
+        <item name="Shop" icon="presets/car_repair.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
             <label text="Edit Car Shop" />
@@ -1385,5 +1385,5 @@
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
         </item>
-        <item name="Repair" icon="presets/car_repair.png" type="node,way,closedway">
+        <item name="Repair" icon="presets/car_repair.png" type="node,closedway">
             <label text="Edit Car Repair" />
             <key key="shop" value="car_repair" />
@@ -1391,5 +1391,5 @@
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
         </item>
-        <item name="Rental" icon="presets/car_rental.png" type="node,way,closedway">
+        <item name="Rental" icon="presets/car_rental.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
@@ -1399,5 +1399,5 @@
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
         </item>
-        <item name="Sharing" icon="presets/car_sharing.png" type="node,way,closedway">
+        <item name="Sharing" icon="presets/car_sharing.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
             <label text="Edit Car Sharing" />
@@ -1408,5 +1408,5 @@
     </group> <!-- Car -->
     <group name="Bicycle" icon="presets/bike.png">
-        <item name="Parking" icon="presets/bike_parking.png" type="node,way,closedway">
+        <item name="Parking" icon="presets/bike_parking.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
             <label text="Edit Bicycle Parking" />
@@ -1415,5 +1415,5 @@
             <text key="capacity" text="Capacity" default="" delete_if_empty="true" />
         </item>
-        <item name="Rental" icon="presets/bicycle_rental.png" type="node,way,closedway">
+        <item name="Rental" icon="presets/bicycle_rental.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
@@ -1422,5 +1422,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Shop" icon="presets/bike.png" type="node,way,closedway">
+        <item name="Shop" icon="presets/bike.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
@@ -1431,5 +1431,5 @@
     </group> <!-- Bicycle -->
     <group name="Public Transport" icon="presets/bus.png">
-        <item name="Station" icon="presets/station.png" type="node,way,closedway">
+        <item name="Station" icon="presets/station.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
@@ -1442,5 +1442,5 @@
             </optional>
         </item>
-        <item name="Railway Halt" icon="presets/station.png" type="node,way,closedway">
+        <item name="Railway Halt" icon="presets/station.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
             <label text="Edit Halt" />
@@ -1451,5 +1451,5 @@
             </optional>
         </item>
-        <item name="Tram Stop" icon="presets/tram.png" type="node,way,closedway">
+        <item name="Tram Stop" icon="presets/tram.png" type="node">
            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
@@ -1461,5 +1461,5 @@
             </optional>
         </item>
-        <item name="Railway Platform" icon="presets/platform_rail.png" type="node,way,closedway">
+        <item name="Railway Platform" icon="presets/platform_rail.png" type="way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
@@ -1471,5 +1471,5 @@
             <check key="area" text="Area" default="off" delete_if_empty="true" />
         </item>
-        <item name="Subway Entrance" icon="presets/underground.png" type="node,way,closedway">
+        <item name="Subway Entrance" icon="presets/underground.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
@@ -1484,5 +1484,5 @@
         </item>
         <separator/>
-        <item name="Bus Station" icon="presets/bus.png" type="node,way,closedway">
+        <item name="Bus Station" icon="presets/bus.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
@@ -1493,5 +1493,5 @@
             </optional>
         </item>
-        <item name="Bus Stop" icon="presets/bus_halt.png" type="node,way,closedway">
+        <item name="Bus Stop" icon="presets/bus_halt.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_stop"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
@@ -1504,5 +1504,5 @@
             </optional>
         </item>
-        <item name="Bus Platform" icon="presets/platform_bus.png" type="node,way,closedway">
+        <item name="Bus Platform" icon="presets/platform_bus.png" type="node,closedway">
             <label text="Edit Bus Platform" />
             <key key="highway" value="platform" />
@@ -1513,5 +1513,5 @@
         </item>
         <separator/>
-        <item name="Taxi" icon="presets/taxi.png" type="node,way,closedway">
+        <item name="Taxi" icon="presets/taxi.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
             <label text="Edit Taxi station" />
@@ -1520,5 +1520,5 @@
         </item>
         <separator/>
-        <item name="Airport" icon="presets/plane.png" type="node,way,closedway">
+        <item name="Airport" icon="presets/plane.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
             <label text="Edit Airport" />
@@ -1534,5 +1534,5 @@
     <separator/>
     <group name="Accomodation" icon="presets/bed.png">
-        <item name="Hotel" icon="presets/bed.png" type="node,way,closedway">
+        <item name="Hotel" icon="presets/bed.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
@@ -1542,5 +1542,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" type="node,way,closedway">
+        <item name="Motel" icon="presets/bed.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
             <label text="Edit Motel" />
@@ -1548,10 +1548,10 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Guest House" icon="presets/bed.png" type="node,way,closedway">
+        <item name="Guest House" icon="presets/bed.png" type="node,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" type="node,way,closedway">
+        <item name="Chalet" icon="presets/empty.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
             <label text="Edit Chalet" />
@@ -1559,5 +1559,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Hostel" icon="presets/hostel.png" type="node,way,closedway">
+        <item name="Hostel" icon="presets/hostel.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
             <label text="Edit Hostel" />
@@ -1565,5 +1565,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Alpine Hut" icon="presets/hostel.png" type="node,way,closedway">
+        <item name="Alpine Hut" icon="presets/hostel.png" type="node,closedway">
             <label text="Edit Alpine Hut" />
             <key key="tourism" value="alpine_hut" />
@@ -1571,10 +1571,10 @@
             <text key="ele" text="Elevation" default="" delete_if_empty="true" />
         </item>
-        <item name="Caravan Site" icon="presets/caravan2.png" type="node,way,closedway">
+        <item name="Caravan Site" icon="presets/caravan2.png" type="node,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" type="node,way,closedway">
+        <item name="Camping Site" icon="presets/tent.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
             <label text="Edit Camping Site" />
@@ -1584,5 +1584,5 @@
     </group> <!-- Accomodation -->
     <group name="Food+Drinks" icon="presets/restaurant.png">
-        <item name="Restaurant" icon="presets/restaurant.png" type="node,way,closedway">
+        <item name="Restaurant" icon="presets/restaurant.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
             <label text="Edit 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="Fast Food" icon="presets/fastfood.png" type="node,way,closedway">
+        <item name="Fast Food" icon="presets/fastfood.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
             <label text="Edit Fast Food Restaurant" />
@@ -1598,5 +1598,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" type="node,way,closedway">
+        <item name="Cafe" icon="presets/cafe.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
             <label text="Edit Cafe" />
@@ -1604,5 +1604,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Pub" icon="presets/pub.png" type="node,way,closedway">
+        <item name="Pub" icon="presets/pub.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
             <label text="Edit Pub" />
@@ -1610,5 +1610,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Biergarten" icon="presets/biergarten.png" type="node,way,closedway">
+        <item name="Biergarten" icon="presets/biergarten.png" type="node,closedway">
             <label text="Edit Biergarten" />
             <key key="amenity" value="biergarten" />
@@ -1616,10 +1616,10 @@
         </item>
         <item name="Bar" icon="presets/bar.png" type="node,closedway">
-          <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-          <label text="Edit Bar" />
-          <key key="amenity" value="bar" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Nightclub" icon="presets/bar.png" type="node,way,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
+            <label text="Edit Bar" />
+            <key key="amenity" value="bar" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Nightclub" icon="presets/bar.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
             <label text="Edit Nightclub" />
@@ -1629,5 +1629,5 @@
     </group> <!-- Food+Drinks -->
     <group name="Tourism" icon="presets/State_Public.png">
-        <item name="Attraction" icon="presets/sightseeing.png" type="node,way,closedway">
+        <item name="Attraction" icon="presets/sightseeing.png" type="node,closedway">
             <label text="Edit Attraction" />
             <key key="tourism" value="attraction" />
@@ -1643,5 +1643,5 @@
             <text key="opening_hours" text="Opening Hours" default="" delete_if_empty="true" />
         </item>
-        <item name="Museum" icon="presets/State_Public.png" type="node,way,closedway">
+        <item name="Museum" icon="presets/State_Public.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
             <label text="Edit Museum" />
@@ -1649,5 +1649,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Zoo" icon="presets/zoo.png" type="node,way,closedway">
+        <item name="Zoo" icon="presets/zoo.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
@@ -1656,5 +1656,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Viewpoint" icon="presets/viewpoint.png" type="node,way,closedway">
+        <item name="Viewpoint" icon="presets/viewpoint.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
             <label text="Edit Viewpoint" />
@@ -1663,5 +1663,5 @@
 <!--<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" type="node,way,closedway">
+        <item name="Theme Park" icon="presets/theme_park.png" type="node,closedway">
             <label text="Edit Theme Park" />
             <key key="tourism" value="theme_park" />
@@ -1700,5 +1700,5 @@
             <text key="description" text="Closer Description" default="" delete_if_empty="true" />
         </item>
-        <item name="Shelter" icon="presets/shelter.png" type="node,way,closedway">
+        <item name="Shelter" icon="presets/shelter.png" type="node,closedway">
             <label text="Edit Shelter" />
             <key key="amenity" value="shelter" />
@@ -1706,5 +1706,5 @@
             <check key="fireplace" text="Fireplace" default="off" delete_if_empty="true" />
         </item>
-        <item name="Picnic Site" icon="presets/picnic.png" type="node,way,closedway">
+        <item name="Picnic Site" icon="presets/picnic.png" type="node,closedway">
             <label text="Edit Picnic Site" />
             <key key="tourism" value="picnic_site" />
@@ -1714,5 +1714,5 @@
     </group> <!-- Tourism -->
     <group name="Historic Places" icon="presets/State_Tourist.png">
-        <item name="Castle" icon="presets/State_Tourist.png" type="node,way,closedway">
+        <item name="Castle" icon="presets/State_Tourist.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
@@ -1721,10 +1721,10 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Ruins" icon="presets/ruins.png" type="node,way,closedway">
+        <item name="Ruins" icon="presets/ruins.png" type="node,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" type="node,way,closedway">
+        <item name="Archaeological Site" icon="presets/historic.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
@@ -1733,10 +1733,10 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Monument" icon="presets/monument.png" type="node,way,closedway">
+        <item name="Monument" icon="presets/monument.png" type="node,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" type="node,way,closedway">
+        <item name="Memorial" icon="presets/memorial.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
             <label text="Edit Memorial" />
@@ -1744,5 +1744,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Battlefield" icon="presets/battlefield.png" type="node,way,closedway">
+        <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
             <label text="Edit Battlefield" />
@@ -1750,10 +1750,10 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Wayside Cross" icon="presets/wayside_cross.png" type="node,way,closedway">
+        <item name="Wayside Cross" icon="presets/wayside_cross.png" type="node,closedway">
             <label text="Edit 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" type="node,way,closedway">
+        <item name="Wayside Shrine" icon="presets/wayside_shrine.png" type="node,closedway">
             <label text="Edit Wayside Shrine" />
             <key key="historic" value="wayside_shrine" />
@@ -1762,10 +1762,10 @@
     </group> <!-- Historic Places -->
     <group name="Leisure" icon="presets/kindergarten.png">
-        <item name="Water Park" icon="presets/swimming.png" type="node,way,closedway">
+        <item name="Water Park" icon="presets/swimming.png" type="node,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" type="node,way,closedway">
+        <item name="Playground" icon="presets/playground.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
             <label text="Edit Playground" />
@@ -1773,5 +1773,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Fishing" icon="presets/fishing.png" type="node,way,closedway">
+        <item name="Fishing" icon="presets/fishing.png" type="node,closedway">
             <label text="Edit Fishing" />
             <key key="leisure" value="fishing" />
@@ -1781,5 +1781,5 @@
     <separator/>
     <group name="Sport Facilities" icon="presets/stadium.png">
-        <item name="Stadium" icon="presets/stadium.png" type="node,way,closedway">
+        <item name="Stadium" icon="presets/stadium.png" type="node,closedway">
             <label text="Edit Stadium" />
             <key key="leisure" value="stadium" />
@@ -1790,5 +1790,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" type="node,way,closedway">
+        <item name="Sports Centre" icon="presets/sports_centre.png" type="node,closedway">
             <label text="Edit Sports Centre" />
             <key key="leisure" value="sports_centre" />
@@ -1799,5 +1799,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" type="node,way,closedway">
+        <item name="Pitch" icon="presets/pitch.png" type="node,closedway">
             <label text="Edit Pitch" />
             <key key="leisure" value="pitch" />
@@ -1808,5 +1808,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" type="node,way,closedway">
+        <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway.relation">
             <label text="Edit Racetrack" />
             <key key="leisure" value="track" />
@@ -1817,10 +1817,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" type="node,way,closedway">
+        <item name="Golf Course" icon="presets/golf.png" type="node,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" type="node,way,closedway">
+        <item name="Miniature Golf" icon="presets/golf.png" type="node,closedway">
             <label text="Edit Miniature Golf" />
             <key key="leisure" value="miniature_golf" />
@@ -1829,5 +1829,5 @@
     </group>
     <group name="Sport" icon="presets/rowing.png">
-        <item name="Multi" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Multi" icon="presets/empty.png" type="node,closedway">
             <label text="Edit Multi" />
             <key key="sport" value="multi" />
@@ -1835,5 +1835,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" type="node,way,closedway">
+        <item name="10pin" icon="presets/empty.png" type="node,closedway">
             <label text="Edit 10pin" />
             <key key="sport" value="10pin" />
@@ -1841,5 +1841,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" type="node,way,closedway">
+        <item name="Athletics" icon="presets/empty.png" type="node,closedway">
             <label text="Edit Athletics" />
             <key key="sport" value="athletics" />
@@ -1847,5 +1847,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" type="node,way,closedway">
+        <item name="Archery" icon="presets/empty.png" type="node,closedway">
             <label text="Edit Archery" />
             <key key="sport" value="archery" />
@@ -1853,5 +1853,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" type="node,way,closedway">
+        <item name="Climbing" icon="presets/empty.png" type="node,closedway">
             <label text="Edit Climbing" />
             <key key="sport" value="climbing" />
@@ -1865,5 +1865,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" type="node,way,closedway">
+        <item name="Cycling" icon="presets/cycling.png" type="node,closedway">
             <label text="Edit Cycling" />
             <key key="sport" value="cycling" />
@@ -1871,5 +1871,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" type="node,way,closedway">
+        <item name="Dog Racing" icon="presets/empty.png" type="node,closedway">
             <label text="Edit Dog Racing" />
             <key key="sport" value="dog_racing" />
@@ -1877,5 +1877,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" type="node,way,closedway">
+        <item name="Equestrian" icon="presets/equestrian.png" type="node,closedway">
             <label text="Edit Equestrian" />
             <key key="sport" value="equestrian" />
@@ -1883,5 +1883,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" type="node,way,closedway">
+        <item name="Horse Racing" icon="presets/equestrian.png" type="node,closedway">
             <label text="Edit Horse Racing" />
             <key key="sport" value="horse_racing" />
@@ -1889,5 +1889,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" type="node,way,closedway">
+        <item name="Gymnastics" icon="presets/gymnastics.png" type="node,closedway">
             <label text="Edit Gymnastics" />
             <key key="sport" value="gymnastics" />
@@ -1895,5 +1895,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" type="node,way,closedway">
+        <item name="Motor Sports" icon="presets/motorbike.png" type="node,closedway">
             <label text="Edit Motor Sports" />
             <key key="sport" value="motor" />
@@ -1901,5 +1901,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" type="node,way,closedway">
+        <item name="Skating" icon="presets/empty.png" type="node,closedway">
             <label text="Edit Skating" />
             <key key="sport" value="skating" />
@@ -1907,5 +1907,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" type="node,way,closedway">
+        <item name="Skateboard" icon="presets/empty.png" type="node,closedway">
             <label text="Edit Skateboard" />
             <key key="sport" value="skateboard" />
@@ -1913,5 +1913,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" type="node,way,closedway">
+        <item name="Swimming" icon="presets/swimming.png" type="node,closedway">
             <label text="Edit Swimming" />
             <key key="sport" value="swimming" />
@@ -1919,5 +1919,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" type="node,way,closedway">
+        <item name="Skiing" icon="presets/skiing_downhill.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
             <label text="Edit Skiing" />
@@ -1928,5 +1928,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" type="node,way,closedway">
+        <item name="Shooting" icon="presets/range.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
             <label text="Edit Shooting" />
@@ -1937,5 +1937,5 @@
     </group>
     <group name="Sport (Ball)" icon="presets/soccer.png">
-        <item name="Soccer" icon="presets/soccer.png" type="node,way,closedway">
+        <item name="Soccer" icon="presets/soccer.png" type="node,closedway">
             <label text="Edit Soccer" />
             <key key="sport" value="soccer" />
@@ -1943,5 +1943,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" type="node,way,closedway">
+        <item name="Football" icon="presets/football.png" type="node,closedway">
             <label text="Edit Football" />
             <key key="sport" value="football" />
@@ -1949,5 +1949,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" type="node,way,closedway">
+        <item name="Australian Football" icon="presets/football.png" type="node,closedway">
             <label text="Edit Australian Football" />
             <key key="sport" value="australian_football" />
@@ -1955,5 +1955,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" type="node,way,closedway">
+        <item name="Baseball" icon="presets/baseball.png" type="node,closedway">
             <label text="Edit Baseball" />
             <key key="sport" value="baseball" />
@@ -1961,5 +1961,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" type="node,way,closedway">
+        <item name="Basketball" icon="presets/basketball.png" type="node,closedway">
             <label text="Edit Basketball" />
             <key key="sport" value="basketball" />
@@ -1967,5 +1967,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" type="node,way,closedway">
+        <item name="Golf" icon="presets/golf.png" type="node,closedway">
             <label text="Edit Golf" />
             <key key="sport" value="golf" />
@@ -1973,5 +1973,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" type="node,way,closedway">
+        <item name="Boule" icon="presets/boule.png" type="node,closedway">
             <label text="Edit Boule" />
             <key key="sport" value="boules" />
@@ -1979,5 +1979,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" type="node,way,closedway">
+        <item name="Bowls" icon="presets/boule.png" type="node,closedway">
             <label text="Edit Bowls" />
             <key key="sport" value="bowls" />
@@ -1985,5 +1985,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" type="node,way,closedway">
+        <item name="Cricket" icon="presets/cricket.png" type="node,closedway">
             <label text="Edit Cricket" />
             <key key="sport" value="cricket" />
@@ -1991,5 +1991,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" type="node,way,closedway">
+        <item name="Cricket Nets" icon="presets/empty.png" type="node,closedway">
             <label text="Edit Cricket Nets" />
             <key key="sport" value="cricket_nets" />
@@ -1997,5 +1997,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" type="node,way,closedway">
+        <item name="Croquet" icon="presets/empty.png" type="node,closedway">
             <label text="Edit Croquet" />
             <key key="sport" value="croquet" />
@@ -2003,5 +2003,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" type="node,way,closedway">
+        <item name="Hockey" icon="presets/Hockey.png" type="node,closedway">
             <label text="Edit Hockey" />
             <key key="sport" value="hockey" />
@@ -2009,5 +2009,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" type="node,way,closedway">
+        <item name="Pelota" icon="presets/empty.png" type="node,closedway">
             <label text="Edit Pelota" />
             <key key="sport" value="pelota" />
@@ -2015,5 +2015,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" type="node,way,closedway">
+        <item name="Racquet" icon="presets/racquetball.png" type="node,closedway">
             <label text="Edit Racquet" />
             <key key="sport" value="racquet" />
@@ -2021,5 +2021,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" type="node,way,closedway">
+        <item name="Rugby" icon="presets/football.png" type="node,closedway">
             <label text="Edit Rugby" />
             <key key="sport" value="rugby" />
@@ -2027,5 +2027,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" type="node,way,closedway">
+        <item name="Table Tennis" icon="presets/table_tennis.png" type="node,closedway">
             <label text="Edit Table Tennis" />
             <key key="sport" value="table_tennis" />
@@ -2033,5 +2033,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" type="node,way,closedway">
+        <item name="Tennis" icon="presets/tennis.png" type="node,closedway">
             <label text="Edit Tennis" />
             <key key="sport" value="tennis" />
@@ -2042,8 +2042,8 @@
     <separator/>
     <group name="Buildings" icon="presets/townhall.png">
-        <item name="Building" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Building" icon="presets/empty.png" type="closedway,relation">
             <key key="building" value="yes" />
         </item>
-        <item name="Public Building" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Public Building" icon="presets/empty.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
             <label text="Edit Public Building" />
@@ -2051,5 +2051,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Town hall" icon="presets/townhall.png" type="node,way,closedway">
+        <item name="Town hall" icon="presets/townhall.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
             <label text="Edit Town hall" />
@@ -2057,5 +2057,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Embassy" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Embassy" icon="presets/empty.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
             <label text="Edit Embassy" />
@@ -2063,5 +2063,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Courthouse" icon="presets/JusticeScales.png" type="node,way,closedway">
+        <item name="Courthouse" icon="presets/JusticeScales.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
@@ -2070,5 +2070,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Prison" icon="presets/prison.png" type="node,way,closedway">
+        <item name="Prison" icon="presets/prison.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
@@ -2077,5 +2077,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Police" icon="presets/police.png" type="node,way,closedway">
+        <item name="Police" icon="presets/police.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=police"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
@@ -2085,5 +2085,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Fire Station" icon="presets/firebrigade.png" type="node,way,closedway">
+        <item name="Fire Station" icon="presets/firebrigade.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
@@ -2092,5 +2092,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Post Office" icon="presets/letter.png" type="node,way,closedway">
+        <item name="Post Office" icon="presets/letter.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
             <label text="Edit Post Office" />
@@ -2099,10 +2099,10 @@
         </item>
         <separator/>
-        <item name="Kindergarten" icon="presets/kindergarten.png" type="node,way,closedway">
+        <item name="Kindergarten" icon="presets/kindergarten.png" type="node,closedway,relation">
             <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" type="node,way,closedway">
+        <item name="School" icon="presets/school.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
             <label text="Edit School" />
@@ -2110,5 +2110,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="University" icon="presets/empty.png" type="node,way,closedway">
+        <item name="University" icon="presets/empty.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
             <label text="Edit University" />
@@ -2116,5 +2116,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="College" icon="presets/empty.png" type="node,way,closedway">
+        <item name="College" icon="presets/empty.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
             <label text="Edit College" />
@@ -2123,5 +2123,5 @@
         </item>
         <separator/>
-        <item name="Cinema" icon="presets/cinema.png" type="node,way,closedway">
+        <item name="Cinema" icon="presets/cinema.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
@@ -2130,5 +2130,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Library" icon="styles/standard/shop/rental/library.png" type="node,way,closedway">
+        <item name="Library" icon="styles/standard/shop/rental/library.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
@@ -2137,5 +2137,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Arts Centre" icon="presets/arts_centre.png" type="node,way,closedway">
+        <item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
             <label text="Edit Arts Centre" />
@@ -2143,5 +2143,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Theatre" icon="presets/theater.png" type="node,way,closedway">
+        <item name="Theatre" icon="presets/theater.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
@@ -2150,5 +2150,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Place of Worship" icon="presets/church.png" type="node,way,closedway">
+        <item name="Place of Worship" icon="presets/church.png" type="node,closedway,relation">
             <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"
@@ -2175,5 +2175,5 @@
             </optional>
         </item>
-        <item name="Address Interpolation" icon="presets/addresses.png" type="node,way,closedway">
+        <item name="Address Interpolation" icon="presets/addresses.png" type="way">
            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
                  de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
@@ -2184,25 +2184,25 @@
     </group> <!-- Buildings -->
     <group name="Man Made" icon="presets/works.png">
-        <item name="Works" icon="presets/works.png" type="node,way,closedway">
+        <item name="Works" icon="presets/works.png" type="node,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" type="node,way,closedway">
+        <item name="Tower" icon="presets/tower.png" type="node,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" type="node,way,closedway">
+        <item name="Water Tower" icon="presets/water_tower.png" type="node,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" type="node,way,closedway">
+        <item name="Gasometer" icon="presets/gasometer.png" type="node,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" type="node,way,closedway">
+        <item name="Lighthouse" icon="presets/lighthouse.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
             <label text="Edit Lighthouse" />
@@ -2210,5 +2210,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Windmill" icon="presets/windmill.png" type="node,way,closedway">
+        <item name="Windmill" icon="presets/windmill.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
             <label text="Edit Windmill" />
@@ -2216,5 +2216,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Pipeline" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Pipeline" icon="presets/empty.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
             <label text="Edit Pipeline" />
@@ -2222,5 +2222,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Wastewater Plant" icon="presets/wastewater_plant.png" type="node,way,closedway">
+        <item name="Wastewater Plant" icon="presets/wastewater_plant.png" type="node,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"
@@ -2230,5 +2230,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Crane" icon="presets/crane.png" type="node,way,closedway">
+        <item name="Crane" icon="presets/crane.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
             <label text="Edit Crane" />
@@ -2236,5 +2236,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Beacon" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Beacon" icon="presets/empty.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
             <label text="Edit Beacon" />
@@ -2242,5 +2242,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Survey Point" icon="presets/survey_point.png" type="node,way,closedway">
+        <item name="Survey Point" icon="presets/survey_point.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
             <label text="Edit Survey Point" />
@@ -2248,5 +2248,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Surveillance" icon="presets/surveillance.png" type="node,way,closedway">
+        <item name="Surveillance" icon="presets/surveillance.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
             <label text="Edit Surveillance Camera" />
@@ -2255,5 +2255,5 @@
         </item>
         <separator/>
-        <item name="Power Generator" icon="presets/power.png" type="node,way,closedway">
+        <item name="Power Generator" icon="presets/power.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
@@ -2264,5 +2264,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Power Station" icon="presets/power.png" type="node,way,closedway">
+        <item name="Power Station" icon="presets/power.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
@@ -2271,5 +2271,5 @@
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
         </item>
-        <item name="Power Sub Station" icon="presets/power.png" type="node,way,closedway">
+        <item name="Power Sub Station" icon="presets/power.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
@@ -2279,5 +2279,5 @@
             <text key="ref" text="Line reference" default="" delete_if_empty="true" />
         </item>
-        <item name="Power Tower" icon="presets/power_tower.png" type="node,way,closedway">
+        <item name="Power Tower" icon="presets/power_tower.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=tower"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=tower"
@@ -2287,5 +2287,5 @@
             <key key="power" value="tower" />
         </item>
-        <item name="Power Line" icon="presets/power.png" type="node,way,closedway">
+        <item name="Power Line" icon="presets/power.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
@@ -2299,5 +2299,5 @@
     </group> <!-- Man Made -->
     <group name="Amenities" icon="presets/telephone.png">
-        <item name="Toilets" icon="presets/toilet.png" type="node,way,closedway">
+        <item name="Toilets" icon="presets/toilet.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=toilets"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=toilets" />
@@ -2308,10 +2308,10 @@
             <text key="note" text="Note" default="" delete_if_empty="true" />
         </item>
-        <item name="Post Box" icon="presets/letter.png" type="node,way,closedway">
+        <item name="Post Box" icon="presets/letter.png" type="node">
             <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" type="node,way,closedway">
+        <item name="Telephone" icon="presets/telephone.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
@@ -2326,5 +2326,5 @@
             <check key="payment:telephone_cards" text="Telephone cards" default="off" delete_if_empty="true" />
         </item>
-        <item name="Recycling" icon="presets/recycling.png" type="node,way,closedway">
+        <item name="Recycling" icon="presets/recycling.png" type="node,closedway">
            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
@@ -2338,9 +2338,9 @@
             <check key="recycling:scrap_metal" text="Scrap Metal" default="off" delete_if_empty="true" />
         </item>
-        <item name="Bench" icon="presets/bench.png" type="node,way,closedway">
+        <item name="Bench" icon="presets/bench.png" type="node">
             <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" type="node,way,closedway">
+        <item name="Hunting Stand" icon="presets/hunting_stand.png" type="node">
             <label text="Edit Hunting Stand" />
             <key key="amenity" value="hunting_stand" />
@@ -2350,5 +2350,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" type="node,way,closedway">
+        <item name="Fountain" icon="presets/spring.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
@@ -2357,5 +2357,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Drinking Water" icon="presets/drinking_water.png" type="node,way,closedway">
+        <item name="Drinking Water" icon="presets/drinking_water.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
@@ -2364,5 +2364,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Baby Hatch" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Baby Hatch" icon="presets/empty.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
             <label text="Edit Baby Hatch" />
@@ -2373,10 +2373,10 @@
     </group> <!-- Amenities -->
     <group name="Shops" icon="presets/shopping.png">
-        <item name="Supermarket" icon="presets/shopping.png" type="node,way,closedway">
+        <item name="Supermarket" icon="presets/shopping.png" type="node,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" type="node,way,closedway">
+        <item name="Convenience Store" icon="presets/empty.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
             <label text="Edit Convenience Store" />
@@ -2384,5 +2384,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Kiosk" icon="presets/kiosk.png" type="node,way,closedway">
+        <item name="Kiosk" icon="presets/kiosk.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
             <label text="Edit Kiosk" />
@@ -2390,5 +2390,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Vending machine" icon="presets/vending_machine.png" type="node,way,closedway">
+        <item name="Vending machine" icon="presets/vending_machine.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
             <label text="Edit Vending machine" />
@@ -2405,5 +2405,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" type="node,way,closedway">
+        <item name="Butcher" icon="presets/cow.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
             <label text="Edit Butcher" />
@@ -2411,5 +2411,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Baker" icon="presets/baker.png" type="node,way,closedway">
+        <item name="Baker" icon="presets/baker.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
             <label text="Edit Baker" />
@@ -2417,5 +2417,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item> 
-        <item name="Florist" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Florist" icon="presets/empty.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
             <label text="Edit Florist" />
@@ -2423,35 +2423,35 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Organic" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Organic" icon="presets/empty.png" type="node,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" type="node,way,closedway">
+        <item name="Beverages" icon="presets/empty.png" type="node,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" type="node,way,closedway">
+        <item name="Computer" icon="presets/empty.png" type="node,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" type="node,way,closedway">
+        <item name="Electronics" icon="presets/empty.png" type="node,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" type="node,way,closedway">
+        <item name="Hifi" icon="presets/empty.png" type="node,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" type="node,way,closedway">
+        <item name="Furniture" icon="presets/empty.png" type="node,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" type="node,way,closedway">
+        <item name="Garden Centre" icon="presets/empty.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
             <label text="Edit Garden Centre" />
@@ -2459,5 +2459,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Hardware" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Hardware" icon="presets/empty.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
             <label text="Edit Hardware Store" />
@@ -2465,5 +2465,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Do-it-yourself-store" icon="presets/diy_store.png" type="node,way,closedway">
+        <item name="Do-it-yourself-store" icon="presets/diy_store.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
             <label text="Edit Do-it-yourself-store" />
@@ -2471,30 +2471,30 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Stationery" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Stationery" icon="presets/empty.png" type="node,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" type="node,way,closedway">
+        <item name="Hairdresser" icon="presets/empty.png" type="node,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" type="node,way,closedway">
+        <item name="Shoes" icon="presets/empty.png" type="node,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" type="node,way,closedway">
+        <item name="Toys" icon="presets/empty.png" type="node,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" type="node,way,closedway">
+        <item name="Video" icon="presets/empty.png" type="node,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" type="node,way,closedway">
+        <item name="Dry Cleaning" icon="presets/laundry.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
             <label text="Edit Dry Cleaning" />
@@ -2502,5 +2502,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Laundry" icon="presets/laundry.png" type="node,way,closedway">
+        <item name="Laundry" icon="presets/laundry.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
             <label text="Edit Laundry" />
@@ -2508,5 +2508,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Outdoor" icon="presets/tent.png" type="node,way,closedway">
+        <item name="Outdoor" icon="presets/tent.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
             <label text="Edit Outdoor Shop" />
@@ -2514,10 +2514,10 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>    
-        <item name="sports" icon="presets/empty.png" type="node,way,closedway">
+        <item name="sports" icon="presets/empty.png" type="node,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" type="node,way,closedway">
+        <item name="optician" icon="presets/empty.png" type="node,closedway">
             <label text="Edit Optician" />
             <key key="shop" value="optician" />
@@ -2527,5 +2527,5 @@
     </group> <!-- Shops -->
     <group name="Cash" icon="presets/dollar.png">
-        <item name="Bank" icon="presets/bank.png" type="node,way,closedway">
+        <item name="Bank" icon="presets/bank.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
             <label text="Edit Bank" />
@@ -2534,5 +2534,5 @@
             <check key="atm" text="Automated Teller Machine" default="on" delete_if_empty="true" />
         </item>
-        <item name="Money Exchange" icon="presets/coins.png" type="node,way,closedway">
+        <item name="Money Exchange" icon="presets/coins.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
             <label text="Edit Money Exchange" />
@@ -2540,5 +2540,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Automated Teller Machine" icon="presets/cash.png" type="node,way,closedway">
+        <item name="Automated Teller Machine" icon="presets/cash.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
             <label text="Edit Automated Teller Machine" />
@@ -2548,5 +2548,5 @@
     </group> <!-- Cash -->
     <group name="Health" icon="presets/pharmacy.png">
-        <item name="Doctors" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Doctors" icon="presets/empty.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
             <label text="Edit Doctors" />
@@ -2554,10 +2554,10 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Dentist" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Dentist" icon="presets/empty.png" type="node,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" type="node,way,closedway">
+        <item name="Pharmacy" icon="presets/pharmacy.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
             <label text="Edit Pharmacy" />
@@ -2566,5 +2566,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Hospital" icon="presets/hospital.png" type="node,way,closedway">
+        <item name="Hospital" icon="presets/hospital.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
             <label text="Edit Hospital" />
@@ -2572,5 +2572,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Emergency Access Point" icon="presets/emergency_access_point.png" type="node,way,closedway">
+        <item name="Emergency Access Point" icon="presets/emergency_access_point.png" type="node,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" />
@@ -2585,5 +2585,5 @@
             <space />
         </item>
-        <item name="Veterinary" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Veterinary" icon="presets/empty.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
@@ -2595,5 +2595,5 @@
     <separator/>
     <group name="Places" icon="presets/places.png">
-        <item name="Continent" icon="presets/places.png" type="node,way,closedway">
+        <item name="Continent" icon="presets/places.png" type="node,closedway">
             <label text="Edit Continent" />
             <space />
@@ -2601,5 +2601,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Country" icon="presets/places.png" type="node,way,closedway">
+        <item name="Country" icon="presets/places.png" type="node,closedway">
             <label text="Edit Country" />
             <space />
@@ -2607,5 +2607,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="State" icon="presets/places.png" type="node,way,closedway">
+        <item name="State" icon="presets/places.png" type="node,closedway">
             <label text="Edit State" />
             <space />
@@ -2613,5 +2613,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Region" icon="presets/places.png" type="node,way,closedway">
+        <item name="Region" icon="presets/places.png" type="node,closedway">
             <label text="Edit Region" />
             <space />
@@ -2619,5 +2619,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="County" icon="presets/places.png" type="node,way,closedway">
+        <item name="County" icon="presets/places.png" type="node,closedway">
             <label text="Edit County" />
             <space />
@@ -2625,5 +2625,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="City" icon="presets/places.png" type="node,way,closedway">
+        <item name="City" icon="presets/places.png" type="node,closedway">
             <label text="Edit City" />
             <space />
@@ -2631,5 +2631,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Town" icon="presets/places.png" type="node,way,closedway">
+        <item name="Town" icon="presets/places.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
             <label text="Edit Town" />
@@ -2638,5 +2638,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Suburb" icon="presets/places.png" type="node,way,closedway">
+        <item name="Suburb" icon="presets/places.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
             <label text="Edit Suburb" />
@@ -2645,5 +2645,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Village" icon="presets/places.png" type="node,way,closedway">
+        <item name="Village" icon="presets/places.png" type="node,closedway">
             <label text="Edit Village" />
             <space />
@@ -2651,5 +2651,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Hamlet" icon="presets/places.png" type="node,way,closedway">
+        <item name="Hamlet" icon="presets/places.png" type="node,closedway">
             <label text="Edit Hamlet" />
             <space />
@@ -2657,5 +2657,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Locality" icon="presets/locality.png" type="node,way,closedway">
+        <item name="Locality" icon="presets/locality.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
             <label text="Edit Locality" />
@@ -2664,5 +2664,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Island" icon="presets/island.png" type="node,way,closedway">
+        <item name="Island" icon="presets/island.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
             <label text="Edit Island" />
@@ -2672,5 +2672,5 @@
         </item>
         <separator/>
-        <item name="Cave Entrance" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Cave Entrance" icon="presets/empty.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
             <label text="Edit Cave Entrance" />
@@ -2678,5 +2678,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Peak" icon="presets/peak.png" type="node,way,closedway">
+        <item name="Peak" icon="presets/peak.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
             <label text="Edit Peak" />
@@ -2685,5 +2685,5 @@
             <text key="ele" text="Elevation" default="" delete_if_empty="true" />
         </item>
-        <item name="Glacier" icon="presets/glacier.png" type="node,way,closedway">
+        <item name="Glacier" icon="presets/glacier.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
             <label text="Edit Glacier" />
@@ -2692,5 +2692,5 @@
             <text key="ele" text="Elevation" default="" delete_if_empty="true" />
         </item>
-        <item name="Volcano" icon="presets/volcano.png" type="node,way,closedway">
+        <item name="Volcano" icon="presets/volcano.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
             <label text="Edit Volcano" />
@@ -2701,5 +2701,5 @@
     </group> <!-- Places -->
     <group name="Boundaries" icon="presets/boundaries.png">
-        <item name="National" icon="presets/boundaries.png" type="node,way,closedway">
+        <item name="National" icon="presets/boundaries.png" type="closedway,relation">
             <label text="Edit National Boundary" />
             <space />
@@ -2707,5 +2707,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Administrative" icon="presets/boundaries.png" type="node,way,closedway">
+        <item name="Administrative" icon="presets/boundaries.png" type="closedway,relation">
             <label text="Edit Administrative Boundary" />
             <space />
@@ -2713,5 +2713,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Civil" icon="presets/boundaries.png" type="node,way,closedway">
+        <item name="Civil" icon="presets/boundaries.png" type="closedway,relation">
             <label text="Edit Civil Boundary" />
             <space />
@@ -2719,5 +2719,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="political" icon="presets/boundaries.png" type="node,way,closedway">
+        <item name="political" icon="presets/boundaries.png" type="closedway,relation">
             <label text="Edit Political Boundary" />
             <space />
@@ -2725,5 +2725,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="National_park" icon="presets/boundaries.png" type="node,way,closedway">
+        <item name="National_park" icon="presets/boundaries.png" type="closedway,relation">
             <label text="Edit National Park Boundary" />
             <space />
@@ -2733,37 +2733,37 @@
     </group> <!-- Boundaries -->
     <group name="Land use" icon="presets/landuse.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"  />
-        <label text="Edit Tree" />
-        <key key="natural" value="tree" />
-        <text key="name" text="Name" default="" delete_if_empty="true" />
-        <text key="type" text="Type" default="" delete_if_empty="true" />
-        <text key="height" text="Height" default="" delete_if_empty="true" />
-        <text key="name:botanical" text="Botanical Name" default="" delete_if_empty="true" />
-      </item>
-      <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" />
-          <label text="Edit Wood" />
-          <key key="natural" value="wood" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-          <combo key="wood" text="Type" values="coniferous,deciduous,mixed" default="" delete_if_empty="true" />
-        </item>
-        <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" />
-          <label text="Edit Forest Landuse" />
-          <space />
-          <key key="landuse" value="forest" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-          <combo key="wood" text="Type" values="coniferous,deciduous,mixed" default="" delete_if_empty="true" />
-        </item>
-        <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" type="node,way,closedway">
+        <item name="Tree" icon="presets/tree.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+            <label text="Edit Tree" />
+            <key key="natural" value="tree" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="type" text="Type" default="" delete_if_empty="true" />
+            <text key="height" text="Height" default="" delete_if_empty="true" />
+            <text key="name:botanical" text="Botanical Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Wood" icon="presets/landuse.png" type="node,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+            <label text="Edit Wood" />
+            <key key="natural" value="wood" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="wood" text="Type" values="coniferous,deciduous,mixed" default="" delete_if_empty="true" />
+        </item>
+        <item name="Forest" icon="presets/landuse.png" type="node,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+            <label text="Edit Forest Landuse" />
+            <space />
+            <key key="landuse" value="forest" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="wood" text="Type" values="coniferous,deciduous,mixed" default="" delete_if_empty="true" />
+        </item>
+        <item name="Nature Reserve" icon="presets/empty.png" type="node,closedway,relation">
+            <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" type="closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
@@ -2773,5 +2773,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Farmland" icon="presets/landuse.png" type="node,way,closedway">
+        <item name="Farmland" icon="presets/landuse.png" type="closedway,relation">
             <label text="Edit Farmland Landuse" />
             <space />
@@ -2779,60 +2779,60 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Meadow" icon="presets/landuse.png" type="node,way,closedway">
-          <label text="Edit Meadow Landuse" />
-          <space />
-          <key key="landuse" value="meadow" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Vineyard" icon="presets/fruits.png" type="node,way,closedway">
-          <label text="Edit Vineyard Landuse" />
-          <space />
-          <key key="landuse" value="vineyard" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Allotments" icon="presets/landuse.png" type="node,way,closedway">
-          <label text="Edit Allotments Landuse" />
-          <space />
-          <key key="landuse" value="allotments" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <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" type="node,way,closedway">
-          <label text="Edit Grass Landuse" />
-          <space />
-          <key key="landuse" value="grass" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <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" />
-          <space />
-          <key key="landuse" value="village_green" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <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" />
-          <key key="leisure" value="common" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <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" type="node,way,closedway">
-          <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-          <label text="Edit Recreation Ground Landuse" />
-          <space />
-          <key key="landuse" value="recreation_ground" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
+        <item name="Meadow" icon="presets/landuse.png" type="node,closedway,relation">
+            <label text="Edit Meadow Landuse" />
+            <space />
+            <key key="landuse" value="meadow" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Vineyard" icon="presets/fruits.png" type="node,closedway,relation">
+            <label text="Edit Vineyard Landuse" />
+            <space />
+            <key key="landuse" value="vineyard" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Allotments" icon="presets/landuse.png" type="node,closedway,relation">
+            <label text="Edit Allotments Landuse" />
+            <space />
+            <key key="landuse" value="allotments" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Garden" icon="presets/empty.png" type="node,closedway,relation">
+            <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" type="node,closedway,relation">
+            <label text="Edit Grass Landuse" />
+            <space />
+            <key key="landuse" value="grass" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Village Green" icon="presets/landuse.png" type="node,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
+            <label text="Edit Village Green Landuse" />
+            <space />
+            <key key="landuse" value="village_green" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Common" icon="presets/empty.png" type="node,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
+            <label text="Edit Common" />
+            <key key="leisure" value="common" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Park" icon="presets/empty.png" type="node,closedway,relation">
+            <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" type="node,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
+            <label text="Edit Recreation Ground Landuse" />
+            <space />
+            <key key="landuse" value="recreation_ground" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
         <separator/>
-        <item name="Residential area" icon="presets/landuse.png" type="node,way,closedway">
+        <item name="Residential area" icon="presets/landuse.png" type="closedway,relation">
             <label text="Edit Residential Landuse" />
             <space />
@@ -2840,22 +2840,22 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <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" />
-          <key key="amenity" value="grave_yard" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-          <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarianist,zoroastrian" default="" delete_if_empty="true" />
-          <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" type="node,way,closedway">
-          <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-          <label text="Edit Cemetery Landuse" />
-          <space />
-          <key key="landuse" value="cemetery" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-          <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarianist,zoroastrian" default="" delete_if_empty="true" />
-          <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" type="node,way,closedway">
+        <item name="Graveyard" icon="presets/graveyard.png" type="node,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
+            <label text="Edit Graveyard" />
+            <key key="amenity" value="grave_yard" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarianist,zoroastrian" default="" delete_if_empty="true" />
+            <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" type="node,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
+            <label text="Edit Cemetery Landuse" />
+            <space />
+            <key key="landuse" value="cemetery" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarianist,zoroastrian" default="" delete_if_empty="true" />
+            <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" type="node,closedway,relation">
             <label text="Edit Retail Landuse" />
             <space />
@@ -2863,5 +2863,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Commercial" icon="presets/landuse.png" type="node,way,closedway">
+        <item name="Commercial" icon="presets/landuse.png" type="node,closedway,relation">
             <label text="Edit Commercial Landuse" />
             <space />
@@ -2869,5 +2869,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Industrial" icon="presets/works.png" type="node,way,closedway">
+        <item name="Industrial" icon="presets/works.png" type="node,closedway,relation">
             <label text="Edit Industrial Landuse" />
             <space />
@@ -2875,5 +2875,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Railway land" icon="presets/rail_light.png" type="node,way,closedway">
+        <item name="Railway land" icon="presets/rail_light.png" type="closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
             <label text="Edit Railway Landuse" />
@@ -2883,17 +2883,17 @@
         </item>
         <separator/>
-        <item name="Brownfield" icon="presets/landuse.png" type="node,way,closedway">
-          <label text="Edit Brownfield Landuse" />
-          <space />
-          <key key="landuse" value="brownfield" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Greenfield" icon="presets/landuse.png" type="node,way,closedway">
-          <label text="Edit Greenfield Landuse" />
-          <space />
-          <key key="landuse" value="greenfield" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Construction area" icon="presets/construction.png" type="node,way,closedway">
+        <item name="Brownfield" icon="presets/landuse.png" type="node,closedway,relation">
+            <label text="Edit Brownfield Landuse" />
+            <space />
+            <key key="landuse" value="brownfield" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Greenfield" icon="presets/landuse.png" type="node,closedway,relation">
+            <label text="Edit Greenfield Landuse" />
+            <space />
+            <key key="landuse" value="greenfield" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Construction area" icon="presets/construction.png" type="node,closedway,relation">
             <label text="Edit Construction Landuse" />
             <space />
@@ -2901,17 +2901,17 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Landfill" icon="presets/landuse.png" type="node,way,closedway">
-          <label text="Edit Landfill Landuse" />
-          <space />
-          <key key="landuse" value="landfill" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Quarry" icon="presets/mine.png" type="node,way,closedway">
-          <label text="Edit Quarry Landuse" />
-          <space />
-          <key key="landuse" value="quarry" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Military" icon="presets/military.png" type="node,way,closedway">
+        <item name="Landfill" icon="presets/landuse.png" type="node,closedway,relation">
+            <label text="Edit Landfill Landuse" />
+            <space />
+            <key key="landuse" value="landfill" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Quarry" icon="presets/mine.png" type="node,closedway,relation">
+            <label text="Edit Quarry Landuse" />
+            <space />
+            <key key="landuse" value="quarry" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Military" icon="presets/military.png" type="node,closedway,relation">
             <label text="Edit Military Landuse" />
             <space />
@@ -2920,25 +2920,25 @@
         </item>
         <separator/>
-        <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" 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" type="node,way,closedway">
-          <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-          <label text="Edit Fell" />
-          <key key="natural" value="fell" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <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" />
-          <key key="natural" value="heath" />
-          <text key="name" text="Name" default="" delete_if_empty="true" />
+        <item name="Scree" icon="presets/empty.png" type="node,closedway,relation">
+            <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" type="node,closedway,relation">
+            <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" type="node,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+            <label text="Edit Fell" />
+            <key key="natural" value="fell" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Heath" icon="presets/empty.png" type="node,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+            <label text="Edit Heath" />
+            <key key="natural" value="heath" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
     </group> <!-- Landuse -->