Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 9561)
+++ trunk/data/defaultpresets.xml	(revision 9574)
@@ -2047,5 +2047,5 @@
             <text key="name" text="Name" />
         </item> <!-- Reservoir -->
-        <item name="Covered Reservoir" icon="presets/reservoir_covered.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Covered Reservoir" icon="presets/reservoir_covered.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=reservoir_covered"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=reservoir_covered"
@@ -2059,5 +2059,5 @@
         </item> <!-- Covered Reservoir -->
         <separator/>
-        <item name="Water" name_context="natural" icon="styles/standard/nautical/water.svg" type="closedway,relation" preset_name_label="true">
+        <item name="Water" name_context="natural" icon="styles/standard/nautical/water.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=water"
@@ -2080,5 +2080,5 @@
             <reference ref="water_access" />
         </item> <!-- Water -->
-        <item name="Coastline" icon="styles/standard/nautical/coast_line.svg" type="way,closedway,relation" preset_name_label="true">
+        <item name="Coastline" icon="styles/standard/nautical/coast_line.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=coastline"
@@ -2094,5 +2094,5 @@
             <text key="name" text="Name" />
         </item> <!-- Coastline -->
-        <item name="Riverbank" icon="styles/standard/nautical/waterway_riverbank.svg" type="closedway,relation" preset_name_label="true">
+        <item name="Riverbank" icon="styles/standard/nautical/waterway_riverbank.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=riverbank"
@@ -2113,5 +2113,5 @@
         </item> <!-- Riverbank -->
         <separator/>
-        <item name="Wetland" icon="styles/standard/misc/landuse/wetland.svg" type="closedway,relation" preset_name_label="true">
+        <item name="Wetland" icon="styles/standard/misc/landuse/wetland.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=wetland"
@@ -2132,5 +2132,5 @@
             <check key="seasonal" text="Seasonal" disable_off="true" />
         </item> <!-- Wetland -->
-        <item name="Mud" icon="styles/standard/misc/landuse/mud.svg" type="closedway,relation" preset_name_label="true">
+        <item name="Mud" icon="styles/standard/misc/landuse/mud.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=mud"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=mud"
@@ -2143,5 +2143,5 @@
             <text key="name" text="Name" />
         </item> <!-- Mud -->
-        <item name="Beach" icon="styles/standard/nautical/beach.svg" type="closedway,relation" preset_name_label="true">
+        <item name="Beach" icon="styles/standard/nautical/beach.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=beach"
@@ -2163,5 +2163,5 @@
             </optional>
         </item> <!-- Beach -->
-        <item name="Bay" icon="styles/standard/nautical/bay.svg" type="node,closedway,relation" preset_name_label="true">
+        <item name="Bay" icon="styles/standard/nautical/bay.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=bay"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=bay"
@@ -2178,5 +2178,5 @@
     </group> <!-- Water -->
     <group name="Shipping" icon="presets/ferry.png">
-        <item name="Ferry Terminal" icon="presets/ferry.png" type="node,closedway" preset_name_label="true">
+        <item name="Ferry Terminal" icon="presets/ferry.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=ferry_terminal"
@@ -2203,5 +2203,5 @@
         </item> <!-- Ferry Route -->
         <separator/>
-        <item name="Marina" icon="styles/standard/nautical/marina.png" type="node,closedway" preset_name_label="true">
+        <item name="Marina" icon="styles/standard/nautical/marina.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=marina"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=marina"
@@ -2244,5 +2244,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Marine Fuel -->
-        <item name="Pier" icon="styles/standard/nautical/pier.svg" type="node,way,closedway" preset_name_label="true">
+        <item name="Pier" icon="styles/standard/nautical/pier.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=pier"
@@ -2290,5 +2290,5 @@
             </optional>
         </item> <!-- Slipway -->
-        <item name="Boatyard" icon="presets/boatyard.png" type="node,closedway" preset_name_label="true">
+        <item name="Boatyard" icon="presets/boatyard.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=boatyard"
@@ -2302,5 +2302,5 @@
             <text key="name" text="Name" />
         </item> <!-- Boatyard -->
-        <item name="Dock" icon="presets/boatyard.png" type="node,closedway" preset_name_label="true">
+        <item name="Dock" icon="presets/boatyard.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=dock"
@@ -2622,5 +2622,5 @@
     <separator/>
     <group name="Car" icon="presets/car.png">
-        <item name="Parking" icon="presets/parking.png" type="node,closedway" preset_name_label="true">
+        <item name="Parking" icon="presets/parking.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking"
@@ -2682,5 +2682,5 @@
         </item> <!-- Parking Entrance -->
         <separator/>
-        <item name="Fuel" icon="presets/fuel.png" type="node,closedway" preset_name_label="true">
+        <item name="Fuel" icon="presets/fuel.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
@@ -2746,5 +2746,5 @@
             <text key="amperage" text="Amperage" />
         </item> <!-- Charging Station -->
-        <item name="Wash" icon="presets/car_wash.png" type="node,closedway" preset_name_label="true">
+        <item name="Wash" icon="presets/car_wash.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_wash"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=car_wash"
@@ -2761,5 +2761,5 @@
         </item> <!-- Wash -->
         <separator/>
-        <item name="Car Dealer" icon="presets/car.png" type="node,closedway" preset_name_label="true">
+        <item name="Car Dealer" icon="presets/car.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=car"
@@ -2779,5 +2779,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Car Dealer -->
-        <item name="Repair" icon="presets/car_repair.png" type="node,closedway" preset_name_label="true">
+        <item name="Repair" icon="presets/car_repair.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car_repair"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=car_repair"
@@ -2792,5 +2792,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Repair -->
-        <item name="Parts" icon="styles/standard/vehicle/car_parts.svg" type="node,closedway" preset_name_label="true">
+        <item name="Parts" icon="styles/standard/vehicle/car_parts.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car_parts"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=car_parts"
@@ -2802,5 +2802,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Parts -->
-        <item name="Tires" icon="presets/tyres.png" type="node,closedway" preset_name_label="true">
+        <item name="Tires" icon="presets/tyres.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tyres"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=tyres"
@@ -2812,5 +2812,5 @@
         </item> <!-- Tires -->
         <separator/>
-        <item name="Rental" icon="presets/car_rental.png" type="node,closedway" preset_name_label="true">
+        <item name="Rental" icon="presets/car_rental.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=car_rental"
@@ -2826,5 +2826,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Rental -->
-        <item name="Sharing" icon="presets/car_sharing.png" type="node,closedway" preset_name_label="true">
+        <item name="Sharing" icon="presets/car_sharing.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=car_sharing"
@@ -2843,5 +2843,5 @@
     </group> <!-- Car -->
     <group name="Motorcycle" icon="presets/motorbike.png">
-        <item name="Parking" icon="styles/standard/vehicle/parking/motorbike.png" type="node,closedway" preset_name_label="true">
+        <item name="Parking" icon="styles/standard/vehicle/parking/motorbike.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=motorcycle_parking"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=motorcycle_parking"
@@ -2857,5 +2857,5 @@
             <check key="covered" text="Covered (with roof)" />
         </item> <!-- Parking -->
-        <item name="Motorcycle Dealer" icon="presets/motorbike.png" type="node,closedway" preset_name_label="true">
+        <item name="Motorcycle Dealer" icon="presets/motorbike.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=motorcycle"
@@ -2884,5 +2884,5 @@
     </group> <!-- Motorcycle -->
     <group name="Bicycle" icon="presets/bike.png">
-        <item name="Parking" icon="styles/standard/vehicle/parking/bicycle.png" type="node,way,closedway" preset_name_label="true">
+        <item name="Parking" icon="styles/standard/vehicle/parking/bicycle.png" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bicycle_parking"
@@ -2906,5 +2906,5 @@
             <reference ref="supervised_lit_oh" />
         </item> <!-- Parking -->
-        <item name="Bike Dealer" icon="presets/bike.png" type="node,closedway" preset_name_label="true">
+        <item name="Bike Dealer" icon="presets/bike.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=bicycle"
@@ -2928,5 +2928,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Bike Dealer -->
-        <item name="Rental" icon="presets/bicycle_rental.png" type="node,closedway" preset_name_label="true">
+        <item name="Rental" icon="presets/bicycle_rental.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bicycle_rental"
@@ -2946,5 +2946,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Rental -->
-        <item name="Public Bicycle Repair Station" icon="styles/standard/vehicle/bicycle_repair_station.svg" type="node,closedway" preset_name_label="true">
+        <item name="Public Bicycle Repair Station" icon="styles/standard/vehicle/bicycle_repair_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_repair_station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bicycle_repair_station"
@@ -3053,5 +3053,5 @@
             <check key="ferry" text="Ferry" />
         </item> <!-- Stop Position -->
-        <item name="Platform" type="node,way,closedway" icon="presets/platform_bus.png" preset_name_label="true">
+        <item name="Platform" type="node,way,closedway,multipolygon" icon="presets/platform_bus.png" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Platform" />
             <space />
@@ -3084,5 +3084,5 @@
             </optional>
         </item> <!-- Platform -->
-        <item name="Station" name_context="railway" type="node,closedway" icon="styles/standard/transport/railway_station.png" preset_name_label="true">
+        <item name="Station" name_context="railway" type="node,closedway,multipolygon" icon="styles/standard/transport/railway_station.png" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:public_transport=station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:public_transport=station"
@@ -3156,5 +3156,5 @@
             </roles>
         </item> <!-- Public transport route (Legacy) -->
-        <item name="Station" name_context="railway" icon="styles/standard/transport/railway_station.png" type="node,closedway" preset_name_label="true">
+        <item name="Station" name_context="railway" icon="styles/standard/transport/railway_station.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station"
@@ -3191,5 +3191,5 @@
             </optional>
         </item> <!-- Tram Stop -->
-        <item name="Railway Platform" icon="presets/platform_rail.png" type="way,closedway" preset_name_label="true">
+        <item name="Railway Platform" icon="presets/platform_rail.png" type="way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform"
@@ -3203,5 +3203,5 @@
         </item> <!-- Railway Platform -->
         <separator/>
-        <item name="Bus Station" icon="presets/bus.png" type="node,closedway" preset_name_label="true">
+        <item name="Bus Station" icon="presets/bus.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station"
@@ -3234,5 +3234,5 @@
             </optional>
         </item> <!-- Bus Stop -->
-        <item name="Bus Platform" icon="presets/platform_bus.png" type="node,way,closedway" preset_name_label="true">
+        <item name="Bus Platform" icon="presets/platform_bus.png" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=platform"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=platform"
@@ -3247,5 +3247,5 @@
         </item> <!-- Bus Platform -->
     </group> <!-- Public Transport -->
-    <item name="Taxi" icon="presets/taxi.png" type="node,closedway" preset_name_label="true">
+    <item name="Taxi" icon="presets/taxi.png" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=taxi"
@@ -3264,5 +3264,5 @@
     <separator/>
     <group name="Airport" icon="presets/plane.png">
-        <item name="Airport Ground" icon="presets/plane.png" type="node,closedway" preset_name_label="true">
+        <item name="Airport Ground" icon="presets/plane.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=aerodrome"
@@ -3309,5 +3309,5 @@
             </optional>
         </item> <!-- Helipad -->
-        <item name="Apron" icon="presets/apron.png" type="closedway" preset_name_label="true">
+        <item name="Apron" icon="presets/apron.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=apron"
@@ -3323,5 +3323,5 @@
             <text key="ref" text="Reference" />
         </item> <!-- Plane Parking Position -->
-        <item name="Hangar" icon="presets/hangar.png" type="node,closedway" preset_name_label="true">
+        <item name="Hangar" icon="presets/hangar.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=hangar"
@@ -3346,5 +3346,5 @@
         </item> <!-- Windsock -->
         <separator/>
-        <item name="Terminal" icon="styles/standard/transport/airport/terminal.png" type="node,closedway" preset_name_label="true">
+        <item name="Terminal" icon="styles/standard/transport/airport/terminal.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=terminal"
@@ -3372,5 +3372,5 @@
   <group name="Facilities" icon="presets/bed.png">
     <group name="Accommodation" icon="presets/bed.png">
-        <item name="Hotel" icon="styles/standard/accommodation/hotel.svg" type="node,closedway" preset_name_label="true">
+        <item name="Hotel" icon="styles/standard/accommodation/hotel.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=hotel"
@@ -3394,5 +3394,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Hotel -->
-        <item name="Motel" icon="styles/standard/accommodation/motel.svg" type="node,closedway" preset_name_label="true">
+        <item name="Motel" icon="styles/standard/accommodation/motel.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=motel"
@@ -3415,5 +3415,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Motel -->
-        <item name="Guest House/Bed &amp; Breakfast" icon="styles/standard/accommodation/guest_house.png" type="node,closedway" preset_name_label="true">
+        <item name="Guest House/Bed &amp; Breakfast" icon="styles/standard/accommodation/guest_house.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=guest_house"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=guest_house"
@@ -3435,5 +3435,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Guest House/Bed & Breakfast -->
-        <item name="Chalet" icon="styles/standard/accommodation/chalet.png" type="node,closedway" preset_name_label="true">
+        <item name="Chalet" icon="styles/standard/accommodation/chalet.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=chalet"
@@ -3456,5 +3456,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Chalet -->
-        <item name="Hostel" icon="styles/standard/accommodation/hostel.svg" type="node,closedway" preset_name_label="true">
+        <item name="Hostel" icon="styles/standard/accommodation/hostel.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=hostel"
@@ -3477,5 +3477,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Hostel -->
-        <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut_blue.png" type="node,closedway" preset_name_label="true">
+        <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut_blue.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=alpine_hut"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=alpine_hut"
@@ -3496,5 +3496,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Alpine Hut -->
-        <item name="Wilderness Hut" icon="styles/standard/accommodation/wilderness_hut_blue.png" type="node,closedway" preset_name_label="true">
+        <item name="Wilderness Hut" icon="styles/standard/accommodation/wilderness_hut_blue.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=wilderness_hut"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=wilderness_hut"
@@ -3517,5 +3517,5 @@
         </item> <!-- Wilderness Hut -->
         <separator/>
-        <item name="Caravan Site/RV Park" icon="styles/standard/accommodation/camping/caravan.png" type="node,closedway" preset_name_label="true">
+        <item name="Caravan Site/RV Park" icon="styles/standard/accommodation/camping/caravan.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=caravan_site"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=caravan_site"
@@ -3540,5 +3540,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Caravan Site/RV Park -->
-        <item name="Camping Site" icon="styles/standard/accommodation/camping.png" type="node,closedway" preset_name_label="true">
+        <item name="Camping Site" icon="styles/standard/accommodation/camping.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=camp_site"
@@ -5206,5 +5206,5 @@
   <group name="Sports" icon="styles/standard/sport/soccer.png">
     <group name="Sport Facilities" icon="presets/stadium.png">
-        <item name="Stadium" icon="styles/standard/sport/stadium.png" type="node,closedway" preset_name_label="true">
+        <item name="Stadium" icon="styles/standard/sport/stadium.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=stadium"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=stadium"
@@ -5221,5 +5221,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Stadium -->
-        <item name="Sports Centre" icon="styles/standard/sport/centre.png" type="node,closedway" preset_name_label="true">
+        <item name="Sports Centre" icon="styles/standard/sport/centre.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=sports_centre"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=sports_centre"
@@ -5234,5 +5234,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Sports Centre -->
-        <item name="Pitch" icon="styles/standard/sport/pitch.png" type="node,closedway" preset_name_label="true">
+        <item name="Pitch" icon="styles/standard/sport/pitch.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=pitch"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=pitch"
@@ -5252,5 +5252,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Pitch -->
-        <item name="Racetrack" icon="styles/standard/sport/track.png" type="node,way,closedway,relation" preset_name_label="true">
+        <item name="Racetrack" icon="styles/standard/sport/track.png" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=track"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=track"
@@ -5265,5 +5265,5 @@
             <combo key="sport" text="Sport" values="athletics,cycling,dog_racing,equestrian,horse_racing,running,skating" values_context="sport" />
         </item> <!-- Racetrack -->
-        <item name="Golf Course" icon="styles/standard/sport/golf.svg" type="node,closedway" preset_name_label="true">
+        <item name="Golf Course" icon="styles/standard/sport/golf.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=golf_course"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=golf_course"
@@ -5277,5 +5277,5 @@
             <reference ref="name_oh_wheelchair" />
         </item> <!-- Golf Course -->
-        <item name="Miniature Golf" icon="styles/standard/sport/miniature_golf.svg" type="node,closedway" preset_name_label="true">
+        <item name="Miniature Golf" icon="styles/standard/sport/miniature_golf.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=miniature_golf"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=miniature_golf"
@@ -5290,5 +5290,5 @@
     </group> <!-- Sport Facilities -->
     <group name="Sport" icon="presets/rowing.png">
-        <item name="Multi" icon="styles/standard/sport/multi.png" type="node,closedway" preset_name_label="true">
+        <item name="Multi" icon="styles/standard/sport/multi.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=multi"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=multi" />
@@ -5298,5 +5298,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" />
         </item> <!-- Multi -->
-        <item name="Nine-pin Bowling" icon="styles/standard/sport/10pin.png" type="node,closedway" preset_name_label="true">
+        <item name="Nine-pin Bowling" icon="styles/standard/sport/10pin.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=9pin"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=9pin" />
@@ -5306,5 +5306,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Nine-pin Bowling -->
-        <item name="Ten-pin Bowling" icon="styles/standard/sport/10pin.png" type="node,closedway" preset_name_label="true">
+        <item name="Ten-pin Bowling" icon="styles/standard/sport/10pin.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=10pin"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:sport=10pin" />
@@ -5314,5 +5314,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Ten-pin Bowling -->
-        <item name="Archery" icon="styles/standard/sport/archery.png" type="node,closedway" preset_name_label="true">
+        <item name="Archery" icon="styles/standard/sport/archery.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=archery"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:sport=archery" />
@@ -5322,5 +5322,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Archery -->
-        <item name="Track and Field Athletics" icon="presets/athletics.png" type="node,closedway" preset_name_label="true">
+        <item name="Track and Field Athletics" icon="presets/athletics.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sports=athletics" />
             <space />
@@ -5329,5 +5329,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" default="track" />
         </item> <!-- Track and Field Athletics -->
-        <item name="Running" icon="styles/standard/sport/running.svg" type="node,closedway" preset_name_label="true">
+        <item name="Running" icon="styles/standard/sport/running.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=running" />
             <space />
@@ -5336,5 +5336,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" />
         </item> <!-- Running -->
-        <item name="Climbing" icon="styles/standard/sport/climbing.png" type="node,way,closedway" preset_name_label="true">
+        <item name="Climbing" icon="styles/standard/sport/climbing.png" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=climbing"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=climbing"
@@ -5346,5 +5346,5 @@
             <combo key="leisure" text="Type" values="sports_centre" />
         </item> <!-- Climbing -->
-        <item name="Canoeing/Kayaking" icon="styles/standard/sport/canoe.svg" type="node,way,closedway" preset_name_label="true">
+        <item name="Canoeing/Kayaking" icon="styles/standard/sport/canoe.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canoe" />
             <space />
@@ -5352,5 +5352,5 @@
             <text key="name" text="Name" />
         </item> <!-- Canoeing/Kayaking -->
-        <item name="Cycling" icon="styles/standard/sport/cycling.png" type="node,closedway" preset_name_label="true">
+        <item name="Cycling" icon="styles/standard/sport/cycling.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cycling" />
             <space />
@@ -5359,5 +5359,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
         </item> <!-- Cycling -->
-        <item name="Dog Racing" icon="styles/standard/leisure/dog.png" type="node,closedway" preset_name_label="true">
+        <item name="Dog Racing" icon="styles/standard/leisure/dog.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=dog_racing" />
             <space />
@@ -5366,5 +5366,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
         </item> <!-- Dog Racing -->
-        <item name="Equestrian" icon="presets/equestrian.png" type="node,closedway" preset_name_label="true">
+        <item name="Equestrian" icon="presets/equestrian.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=equestrian" />
             <space />
@@ -5373,5 +5373,5 @@
             <reference ref="riding_surface" />
         </item> <!-- Equestrian -->
-        <item name="Horse Racing" icon="styles/standard/sport/riding.png" type="node,closedway" preset_name_label="true">
+        <item name="Horse Racing" icon="styles/standard/sport/riding.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=horse_racing" />
             <space />
@@ -5380,5 +5380,5 @@
             <reference ref="riding_surface" />
         </item> <!-- Horse Racing -->
-        <item name="Gymnastics" icon="presets/gymnastics.png" type="node,closedway" preset_name_label="true">
+        <item name="Gymnastics" icon="presets/gymnastics.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gymnastics" />
             <space />
@@ -5387,5 +5387,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Gymnastics -->
-        <item name="Skating" icon="presets/skating.png" type="node,closedway" preset_name_label="true">
+        <item name="Skating" icon="presets/skating.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skating"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=skating" />
@@ -5395,5 +5395,5 @@
             <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" default="ice_rink" />
         </item> <!-- Skating -->
-        <item name="Skateboard" icon="styles/standard/sport/skateboard.png" type="node,closedway" preset_name_label="true">
+        <item name="Skateboard" icon="styles/standard/sport/skateboard.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skateboard"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=skateboard" />
@@ -5403,5 +5403,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" default="pitch" values_context="racing" />
         </item> <!-- Skateboard -->
-        <item name="Swimming" icon="styles/standard/sport/pool.png" type="node,closedway" preset_name_label="true">
+        <item name="Swimming" icon="styles/standard/sport/pool.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=swimming"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=swimming"
@@ -5412,5 +5412,5 @@
             <combo key="leisure" text="Type" values="sports_centre,stadium,swimming_pool,water_park" default="swimming_pool" values_searchable="true" />
         </item> <!-- Swimming -->
-        <item name="Scuba Diving" icon="styles/standard/sport/scuba_diving.svg" type="node,closedway" preset_name_label="true">
+        <item name="Scuba Diving" icon="styles/standard/sport/scuba_diving.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=scuba_diving"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=scuba_diving"
@@ -5420,5 +5420,5 @@
             <text key="name" text="Name" />
         </item> <!-- Scuba Diving -->
-        <item name="Skiing" icon="styles/standard/sport/skiing.png" type="node,way,closedway" preset_name_label="true">
+        <item name="Skiing" icon="styles/standard/sport/skiing.png" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Piste_Maps"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Piste_Maps"
@@ -5433,5 +5433,5 @@
             </optional>
         </item> <!-- Skiing -->
-        <item name="Shooting" icon="presets/range.png" type="node,closedway" preset_name_label="true">
+        <item name="Shooting" icon="presets/range.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=shooting"
@@ -5446,5 +5446,5 @@
     </group> <!-- Sport -->
     <group name="Sport (Ball)" icon="styles/standard/sport/soccer.png">
-        <item name="Soccer" icon="styles/standard/sport/soccer.png" type="node,closedway" preset_name_label="true">
+        <item name="Soccer" icon="styles/standard/sport/soccer.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=soccer"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=soccer"
@@ -5456,5 +5456,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Soccer -->
-        <item name="Australian Football" icon="presets/football.png" type="node,closedway" preset_name_label="true">
+        <item name="Australian Football" icon="presets/football.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=australian_football" />
             <space />
@@ -5462,5 +5462,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Australian Football -->
-        <item name="American Football" icon="presets/football.png" type="node,closedway" preset_name_label="true">
+        <item name="American Football" icon="presets/football.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=american_football" />
             <space />
@@ -5468,5 +5468,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- American Football -->
-        <item name="Canadian Football" icon="presets/football.png" type="node,closedway" preset_name_label="true">
+        <item name="Canadian Football" icon="presets/football.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canadian_football" />
             <space />
@@ -5474,5 +5474,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Canadian Football -->
-        <item name="Gaelic Games" icon="styles/standard/sport/soccer.png" type="node,closedway" preset_name_label="true">
+        <item name="Gaelic Games" icon="styles/standard/sport/soccer.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_games" />
             <space />
@@ -5486,5 +5486,5 @@
             </optional>
         </item> <!-- Gaelic Games -->
-        <item name="Rugby League" icon="presets/football.png" type="node,closedway" preset_name_label="true">
+        <item name="Rugby League" icon="presets/football.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_league"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_league" />
@@ -5493,5 +5493,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Rugby League -->
-        <item name="Rugby Union" icon="presets/football.png" type="node,closedway" preset_name_label="true">
+        <item name="Rugby Union" icon="presets/football.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_union"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_union" />
@@ -5500,5 +5500,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Rugby Union -->
-        <item name="Baseball" icon="styles/standard/sport/baseball.png" type="node,closedway" preset_name_label="true">
+        <item name="Baseball" icon="styles/standard/sport/baseball.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=baseball" />
             <space />
@@ -5506,5 +5506,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Baseball -->
-        <item name="Basketball" icon="presets/basketball.png" type="node,closedway" preset_name_label="true">
+        <item name="Basketball" icon="presets/basketball.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=basketball" />
             <space />
@@ -5512,5 +5512,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Basketball -->
-        <item name="Handball" icon="styles/standard/sport/handball.png" type="node,closedway" preset_name_label="true">
+        <item name="Handball" icon="styles/standard/sport/handball.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=handball" />
             <space />
@@ -5519,5 +5519,5 @@
             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
         </item> <!-- Handball -->
-        <item name="Volleyball" icon="styles/standard/sport/volleyball.png" type="node,closedway" preset_name_label="true">
+        <item name="Volleyball" icon="styles/standard/sport/volleyball.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=volleyball" />
             <space />
@@ -5526,5 +5526,5 @@
             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
         </item> <!-- Volleyball -->
-        <item name="Beach Volleyball" icon="presets/beachvolleyball.png" type="node,closedway" preset_name_label="true">
+        <item name="Beach Volleyball" icon="presets/beachvolleyball.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=beachvolleyball" />
             <space />
@@ -5533,5 +5533,5 @@
             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
         </item> <!-- Beach Volleyball -->
-            <item name="Billiards" icon="styles/standard/sport/billiards.svg" type="node,closedway" preset_name_label="true">
+        <item name="Billiards" icon="styles/standard/sport/billiards.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=billiards" />
             <space />
@@ -5540,5 +5540,5 @@
             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
         </item> <!-- Billiards -->
-        <item name="Golf" icon="styles/standard/sport/golf.svg" type="node,closedway" preset_name_label="true">
+        <item name="Golf" icon="styles/standard/sport/golf.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=golf"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=golf"
@@ -5550,5 +5550,5 @@
             <combo key="leisure" text="Type" values="golf_course,pitch,sports_centre,stadium" default="golf_course" />
         </item> <!-- Golf -->
-        <item name="Boule" icon="presets/boule.png" type="node,closedway" preset_name_label="true">
+        <item name="Boule" icon="presets/boule.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=boules" />
             <space />
@@ -5556,5 +5556,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Boule -->
-        <item name="Lawn Bowling" icon="presets/boule.png" type="node,closedway" preset_name_label="true">
+        <item name="Lawn Bowling" icon="presets/boule.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=bowls" />
             <space />
@@ -5562,5 +5562,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Lawn Bowling -->
-        <item name="Cricket" icon="styles/standard/sport/cricket.png" type="node,closedway" preset_name_label="true">
+        <item name="Cricket" icon="styles/standard/sport/cricket.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket" />
             <space />
@@ -5568,5 +5568,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Cricket -->
-        <item name="Croquet" icon="styles/standard/sport/croquet.png" type="node,closedway" preset_name_label="true">
+        <item name="Croquet" icon="styles/standard/sport/croquet.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=croquet" />
             <space />
@@ -5574,5 +5574,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Croquet -->
-        <item name="Field Hockey" icon="presets/field_hockey.png" type="node,closedway" preset_name_label="true">
+        <item name="Field Hockey" icon="presets/field_hockey.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=field_hockey" />
             <space />
@@ -5581,5 +5581,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Field Hockey -->
-        <item name="Ice Hockey" icon="presets/ice_hockey.png" type="node,closedway" preset_name_label="true">
+        <item name="Ice Hockey" icon="presets/ice_hockey.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=ice_hockey" />
             <space />
@@ -5588,5 +5588,5 @@
             <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" />
         </item> <!-- Ice Hockey -->
-        <item name="Pelota" icon="presets/pelota.png" type="node,closedway" preset_name_label="true">
+        <item name="Pelota" icon="presets/pelota.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=pelota"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=pelota" />
@@ -5595,5 +5595,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Pelota -->
-        <item name="Racquetball" icon="styles/standard/sport/racquetball.png" type="node,closedway" preset_name_label="true">
+        <item name="Racquetball" icon="styles/standard/sport/racquetball.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=racquet"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=racquet" />
@@ -5603,5 +5603,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Racquetball -->
-        <item name="Table Tennis/Ping-Pong" icon="presets/table_tennis.png" type="node,closedway" preset_name_label="true">
+        <item name="Table Tennis/Ping-Pong" icon="presets/table_tennis.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=table_tennis" />
             <space />
@@ -5610,5 +5610,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Table Tennis/Ping-Pong -->
-        <item name="Tennis" icon="styles/standard/sport/tennis.png" type="node,closedway" preset_name_label="true">
+        <item name="Tennis" icon="styles/standard/sport/tennis.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=tennis" />
             <space />
@@ -5618,5 +5618,5 @@
     </group> <!-- Sport (Ball) -->
     <group name="Motorsport" icon="presets/motorbike.png">
-        <item name="Motorsport" icon="styles/standard/sport/motor.png" type="node,closedway" preset_name_label="true">
+        <item name="Motorsport" icon="styles/standard/sport/motor.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=motor"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=motor" />
@@ -5626,5 +5626,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
         </item> <!-- Motorsport -->
-        <item name="Kart Racing" icon="presets/karting.png" type="node,closedway" preset_name_label="true">
+        <item name="Kart Racing" icon="presets/karting.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=karting"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=karting" />
@@ -5634,5 +5634,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
         </item> <!-- Kart Racing -->
-        <item name="Motocross" icon="styles/standard/sport/motocross.png" type="node,closedway" preset_name_label="true">
+        <item name="Motocross" icon="styles/standard/sport/motocross.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=motocross"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=motocross"
@@ -5644,5 +5644,5 @@
         </item> <!-- Motocross -->
         <separator/>
-        <item name="Model Aerodrome" icon="presets/plane.png" type="node,closedway" preset_name_label="true">
+        <item name="Model Aerodrome" icon="presets/plane.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=model_aerodrome" />
             <space />
@@ -5651,5 +5651,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="aerialway" />
         </item> <!-- Model Aerodrome -->
-        <item name="RC Car" icon="styles/standard/transport/car.png" type="node,closedway" preset_name_label="true">
+        <item name="RC Car" icon="styles/standard/transport/car.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rc_car"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:sport"
@@ -5673,5 +5673,5 @@
   <group name="Man Made" icon="presets/works.png">
     <group name="Man Made" icon="presets/works.png">
-        <item name="Building" icon="styles/standard/misc/landmark/building.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Building" icon="styles/standard/misc/landmark/building.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:building"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:building"
@@ -5695,5 +5695,5 @@
             <preset_link preset_name="Addresses" />
         </item> <!-- Building -->
-        <item name="Residential Building" icon="styles/standard/misc/landmark/building.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Residential Building" icon="styles/standard/misc/landmark/building.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:building"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:building"
@@ -5716,5 +5716,5 @@
             <preset_link preset_name="Addresses" />
         </item> <!-- Residential Building -->
-            <item name="Building part" icon="styles/standard/misc/landmark/building.png" type="closedway,relation" preset_name_label="true">
+        <item name="Building part" icon="styles/standard/misc/landmark/building.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:building:part"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:building:part"
@@ -5777,5 +5777,5 @@
         </item> <!-- Flagpole -->
         <separator/>
-        <item name="Works" icon="styles/standard/misc/landmark/works.png" type="node,closedway" preset_name_label="true">
+        <item name="Works" icon="styles/standard/misc/landmark/works.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=works"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=works"
@@ -5951,5 +5951,5 @@
             </optional>
         </item> <!-- Water Tower -->
-        <item name="Water Works" icon="presets/water_works.png" type="node,closedway" preset_name_label="true">
+        <item name="Water Works" icon="presets/water_works.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_works"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=water_works"
@@ -5963,5 +5963,5 @@
             <reference ref="name_operator" />
         </item> <!-- Water Works -->
-        <item name="Wastewater Treatment Plant" icon="presets/wastewater_plant.png" type="node,closedway" preset_name_label="true">
+        <item name="Wastewater Treatment Plant" icon="presets/wastewater_plant.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=wastewater_plant"
@@ -6177,5 +6177,5 @@
     </group> <!-- Bridges -->
     <group name="Military" name_context="preset group" icon="presets/military.png">
-        <item name="Airfield" icon="styles/standard/transport/airport/airfield.png" type="node,closedway" preset_name_label="true">
+        <item name="Airfield" icon="styles/standard/transport/airport/airfield.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:military=airfield"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:military=airfield"
@@ -6186,5 +6186,5 @@
             <reference ref="aerodrome" />
         </item>
-        <item name="Barracks" type="node,closedway" preset_name_label="true">
+        <item name="Barracks" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:military=barracks"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:military=barracks"
@@ -6193,5 +6193,5 @@
             <key key="military" value="barracks" />
         </item>
-        <item name="Bunker" icon="styles/standard/misc/landmark/bunker.png" type="node,closedway" preset_name_label="true">
+        <item name="Bunker" icon="styles/standard/misc/landmark/bunker.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:military=bunker"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:military=bunker"
@@ -6208,5 +6208,5 @@
             <check key="ruins" text="Ruins" />
         </item>
-        <item name="Range" icon="styles/standard/misc/landmark/range.png" type="node,closedway" preset_name_label="true">
+        <item name="Range" icon="styles/standard/misc/landmark/range.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:military=range"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:military=range"
@@ -6217,5 +6217,5 @@
     </group> <!-- Military -->
     <group name="Power" icon="styles/standard/power/power.svg">
-        <item name="Power Plant" icon="styles/standard/power/plant.svg" type="closedway,relation" preset_name_label="true">
+        <item name="Power Plant" icon="styles/standard/power/plant.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=plant"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=plant"
@@ -6242,5 +6242,5 @@
         </item> <!-- Power Plant -->
         <group name="Power Generator" icon="styles/standard/power/generator.svg">
-            <item name="Biofuel Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,relation" preset_name_label="true">
+            <item name="Biofuel Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="biofuel" />
                 <reference ref="power_generator" />
@@ -6249,5 +6249,5 @@
                 <reference ref="power_output" />
             </item> <!-- Power Generator -->
-            <item name="Biogas Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,relation" preset_name_label="true">
+            <item name="Biogas Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="biogas" />
                 <reference ref="power_generator" />
@@ -6256,5 +6256,5 @@
                 <reference ref="power_output" />
             </item> <!-- Biogas Power Generator -->
-            <item name="Biomass Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,relation" preset_name_label="true">
+            <item name="Biomass Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="biomass" />
                 <reference ref="power_generator" />
@@ -6268,5 +6268,5 @@
                 <reference ref="power_output" />
             </item> <!-- Biomass Power Generator -->
-            <item name="Coal Power Generator" icon="presets/power_source-coal.svg" type="node,closedway,relation" preset_name_label="true">
+            <item name="Coal Power Generator" icon="presets/power_source-coal.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="coal" />
                 <reference ref="power_generator" />
@@ -6275,5 +6275,5 @@
                 <reference ref="power_output" />
             </item> <!-- Coal Power Generator -->
-            <item name="Gas Power Generator" icon="presets/power_source-gas.svg" type="node,closedway,relation" preset_name_label="true">
+            <item name="Gas Power Generator" icon="presets/power_source-gas.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="gas" />
                 <reference ref="power_generator" />
@@ -6282,5 +6282,5 @@
                 <reference ref="power_output" />
             </item> <!-- Gas Power Generator -->
-            <item name="Oil Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,relation" preset_name_label="true">
+            <item name="Oil Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="oil" />
                 <reference ref="power_generator" />
@@ -6289,5 +6289,5 @@
                 <reference ref="power_output" />
             </item> <!-- Oil Power Generator -->
-            <item name="Diesel Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,relation" preset_name_label="true">
+            <item name="Diesel Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="diesel" />
                 <reference ref="power_generator" />
@@ -6296,5 +6296,5 @@
                 <reference ref="power_output" />
             </item> <!-- Diesel Power Generator -->
-            <item name="Gasoline Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,relation" preset_name_label="true">
+            <item name="Gasoline Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="gasoline" />
                 <reference ref="power_generator" />
@@ -6303,5 +6303,5 @@
                 <reference ref="power_output" />
             </item> <!-- Gasoline Power Generator -->
-            <item name="Nuclear Reactor" icon="presets/power_source-nuclear.svg" type="node,closedway,relation" preset_name_label="true">
+            <item name="Nuclear Reactor" icon="presets/power_source-nuclear.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="nuclear" />
                 <reference ref="power_generator" />
@@ -6328,5 +6328,5 @@
                 <reference ref="power_output" />
             </item> <!-- Nuclear Reactor -->
-            <item name="Solar Power Generator" icon="presets/power_source-sun.svg" type="node,closedway,relation" preset_name_label="true">
+            <item name="Solar Power Generator" icon="presets/power_source-sun.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="solar" />
                 <reference ref="power_generator" />
@@ -6339,5 +6339,5 @@
                 <reference ref="power_output" />
             </item> <!-- Solar Power Generator -->
-            <item name="Waste Power Generator" icon="presets/power_source-waste.svg" type="node,closedway,relation" preset_name_label="true">
+            <item name="Waste Power Generator" icon="presets/power_source-waste.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="waste" />
                 <reference ref="power_generator" />
@@ -6352,5 +6352,5 @@
                 <reference ref="power_output" />
             </item> <!-- Waste Power Generator -->
-            <item name="Water Turbine" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
+            <item name="Water Turbine" icon="presets/power_source-water.svg" type="node,closedway" preset_name_label="true">
                 <key key="generator:source" value="hydro" />
                 <reference ref="power_generator" />
@@ -6364,5 +6364,5 @@
                 <reference ref="power_output" />
             </item> <!-- Water Turbine -->
-            <item name="Tidal Water Turbine" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
+            <item name="Tidal Water Turbine" icon="presets/power_source-water.svg" type="node,closedway" preset_name_label="true">
                 <key key="generator:source" value="tidal" />
                 <reference ref="power_generator" />
@@ -6375,15 +6375,15 @@
                 <reference ref="power_output" />
             </item> <!-- Tidal Water Turbine -->
-            <item name="Wave Energy Converter" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
+            <item name="Wave Energy Converter" icon="presets/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="wave" />
                 <reference ref="power_generator" />
                 <reference ref="power_output" />
             </item> <!-- Wave Energy Converter -->
-            <item name="Osmotic Power Generator" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
+            <item name="Osmotic Power Generator" icon="presets/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="osmotic" />
                 <reference ref="power_generator" />
                 <reference ref="power_output" />
             </item> <!-- Osmotic Power Generator -->
-            <item name="Geothermal Power Generator" icon="presets/power_source-geothermal.svg" type="node,closedway,relation" preset_name_label="true">
+            <item name="Geothermal Power Generator" icon="presets/power_source-geothermal.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="geothermal" />
                 <reference ref="power_generator" />
@@ -6391,5 +6391,5 @@
                 <reference ref="power_output" />
             </item> <!-- Geothermal Power Generator -->
-            <item name="Wind Turbine" icon="presets/power_source-wind.svg" type="node,closedway,relation" preset_name_label="true">
+            <item name="Wind Turbine" icon="presets/power_source-wind.svg" type="node,closedway" preset_name_label="true">
                 <key key="generator:source" value="wind" />
                 <reference ref="power_generator" />
@@ -6400,5 +6400,5 @@
         </group> <!-- Power Generator -->
         <separator/>
-        <item name="Power Substation" icon="styles/standard/power/substation.svg" type="node,closedway" preset_name_label="true">
+        <item name="Power Substation" icon="styles/standard/power/substation.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=substation"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
@@ -6477,5 +6477,5 @@
         </item> <!-- Power Switch -->
         <separator/>
-        <item name="Power Converter" icon="styles/standard/power/converter.svg" type="node,closedway" preset_name_label="true">
+        <item name="Power Converter" icon="styles/standard/power/converter.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=converter"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
@@ -6651,5 +6651,5 @@
     </group> <!-- Power -->
     <group name="Historic Places" icon="styles/standard/sightseeing/castle.svg">
-        <item name="Castle" icon="styles/standard/sightseeing/castle.svg" type="node,closedway" preset_name_label="true">
+        <item name="Castle" icon="styles/standard/sightseeing/castle.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:historic=castle"
@@ -6664,5 +6664,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Castle -->
-        <item name="Ruins" icon="presets/ruins.png" type="node,closedway" preset_name_label="true">
+        <item name="Ruins" icon="presets/ruins.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=ruins"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:historic=ruins"
@@ -6676,5 +6676,5 @@
             <reference ref="name_oh_wheelchair" />
         </item> <!-- Ruins -->
-        <item name="Archaeological Site" icon="styles/standard/sightseeing/archaeological.png" type="node,closedway" preset_name_label="true">
+        <item name="Archaeological Site" icon="styles/standard/sightseeing/archaeological.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site"
@@ -6688,5 +6688,5 @@
             <reference ref="name_oh_wheelchair" />
         </item> <!-- Archaeological Site -->
-        <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway" preset_name_label="true">
+        <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=battlefield"
@@ -6700,5 +6700,5 @@
             <text key="name" text="Name" />
         </item> <!-- Battlefield -->
-        <item name="Palaeontological Site" icon="presets/palaeontological_site.png" type="node,closedway" preset_name_label="true">
+        <item name="Palaeontological Site" icon="presets/palaeontological_site.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:geological=palaeontological_site"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:geological=palaeontological_site"
@@ -6711,5 +6711,5 @@
         </item> <!-- Palaeontological Site -->
         <separator/>
-        <item name="Monument" icon="presets/monument.png" type="node,closedway" preset_name_label="true">
+        <item name="Monument" icon="presets/monument.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=monument"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=monument"
@@ -6724,5 +6724,5 @@
             <text key="name" text="Name" />
         </item> <!-- Monument -->
-        <item name="Memorial" icon="presets/memorial.png" type="node,closedway" preset_name_label="true">
+        <item name="Memorial" icon="presets/memorial.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=memorial"
@@ -6793,5 +6793,5 @@
   <group name="Shops" icon="styles/standard/shop/mall.png">
     <group name="Food" icon="styles/standard/shop/supermarket.svg">
-        <item name="Supermarket" icon="styles/standard/shop/supermarket.svg" type="node,closedway" preset_name_label="true">
+        <item name="Supermarket" icon="styles/standard/shop/supermarket.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=supermarket"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=supermarket"
@@ -6807,5 +6807,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Supermarket -->
-        <item name="Convenience Store" icon="presets/convenience.png" type="node,closedway" preset_name_label="true">
+        <item name="Convenience Store" icon="presets/convenience.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=convenience"
@@ -6821,5 +6821,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Convenience Store -->
-        <item name="Kiosk" icon="presets/kiosk.png" type="node,closedway" preset_name_label="true">
+        <item name="Kiosk" icon="presets/kiosk.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=kiosk"
@@ -6836,5 +6836,5 @@
         </item> <!-- Kiosk -->
         <separator/>
-        <item name="Bakery" icon="presets/baker.png" type="node,closedway" preset_name_label="true">
+        <item name="Bakery" icon="presets/baker.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery"
                   ar.href="http://wiki.openstreetmap.org/wiki/Ar:Tag:shop=bakery"
@@ -6853,5 +6853,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Bakery -->
-        <item name="Butcher" icon="styles/standard/shop/groceries/butcher.png" type="node,closedway" preset_name_label="true">
+        <item name="Butcher" icon="styles/standard/shop/groceries/butcher.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=butcher"
@@ -6868,5 +6868,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Butcher -->
-        <item name="Seafood" icon="presets/seafood.png" type="node,closedway" preset_name_label="true">
+        <item name="Seafood" icon="presets/seafood.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=seafood"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=seafood"
@@ -6880,5 +6880,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Seafood -->
-        <item name="Deli (Fine Food)" icon="presets/deli.png" type="node,closedway" preset_name_label="true">
+        <item name="Deli (Fine Food)" icon="presets/deli.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=deli"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=deli"
@@ -6893,5 +6893,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Deli (Fine Food) -->
-        <item name="Candy Store" icon="presets/confectionery.png" type="node,closedway" preset_name_label="true">
+        <item name="Candy Store" icon="presets/confectionery.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=confectionery"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=confectionery"
@@ -6908,5 +6908,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Candy Store -->
-        <item name="Tea" icon="styles/standard/shop/groceries/tea.svg" type="node,closedway" preset_name_label="true">
+        <item name="Tea" icon="styles/standard/shop/groceries/tea.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tea"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=tea"
@@ -6918,5 +6918,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Tea -->
-        <item name="Coffee" icon="styles/standard/shop/groceries/coffee.svg" type="node,closedway" preset_name_label="true">
+        <item name="Coffee" icon="styles/standard/shop/groceries/coffee.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=coffee"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=coffee"
@@ -6928,5 +6928,5 @@
         </item> <!-- Coffee -->
         <separator/>
-        <item name="Public Market" icon="styles/standard/place/marketplace.png" type="node,way,closedway" preset_name_label="true">
+        <item name="Public Market" icon="styles/standard/place/marketplace.png" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=marketplace"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=marketplace"
@@ -6944,5 +6944,5 @@
             <combo key="organic" text="Organic" values="only,yes,no" />
         </item> <!-- Public Market -->
-        <item name="Greengrocer" icon="presets/greengrocer.png" type="node,closedway" preset_name_label="true">
+        <item name="Greengrocer" icon="presets/greengrocer.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=greengrocer"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=greengrocer"
@@ -6958,5 +6958,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Greengrocer -->
-        <item name="Farm Stand" icon="presets/apple.png" type="node,closedway" preset_name_label="true">
+        <item name="Farm Stand" icon="presets/apple.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=farm"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=farm"
@@ -6973,5 +6973,5 @@
         </item> <!-- Farm Stand -->
         <separator/>
-        <item name="Organic" type="node,closedway" preset_name_label="true">
+        <item name="Organic" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:organic"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:organic"
@@ -6981,5 +6981,5 @@
             <combo text="Organic/Bio" key="organic" values="only,yes,no" match="key" />
         </item> <!-- Organic -->
-        <item name="Fair Trade" type="node,closedway" preset_name_label="true">
+        <item name="Fair Trade" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:fair_trade"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:fair_trade" />
@@ -6988,5 +6988,5 @@
         </item> <!-- Fair Trade -->
         <separator/>
-        <item name="Alcohol" icon="styles/standard/shop/alcohol.png" type="node,closedway" preset_name_label="true">
+        <item name="Alcohol" icon="styles/standard/shop/alcohol.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=alcohol"
@@ -7002,5 +7002,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Alcohol -->
-        <item name="Beverages" icon="styles/standard/shop/beverages.png" type="node,closedway" preset_name_label="true">
+        <item name="Beverages" icon="styles/standard/shop/beverages.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beverages"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=beverages"
@@ -7014,5 +7014,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Beverages -->
-        <item name="Wine" icon="styles/standard/shop/wine.svg" type="node,closedway" preset_name_label="true">
+        <item name="Wine" icon="styles/standard/shop/wine.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=wine"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=wine"
@@ -7025,5 +7025,5 @@
     </group> <!-- Food -->
     <group name="Clothes" icon="styles/standard/shop/clothes.png">
-        <item name="Clothes" icon="styles/standard/shop/clothes.png" type="node,closedway" preset_name_label="true">
+        <item name="Clothes" icon="styles/standard/shop/clothes.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=clothes"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=clothes"
@@ -7042,5 +7042,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Clothes -->
-        <item name="Boutique" icon="presets/boutique.png" type="node,closedway" preset_name_label="true">
+        <item name="Boutique" icon="presets/boutique.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=boutique"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=boutique"
@@ -7054,5 +7054,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Boutique -->
-        <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway" preset_name_label="true">
+        <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=shoes"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=shoes"
@@ -7066,5 +7066,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Shoes -->
-        <item name="Outdoor" icon="styles/standard/shop/outdoor.png" type="node,closedway" preset_name_label="true">
+        <item name="Outdoor" icon="styles/standard/shop/outdoor.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=outdoor"
@@ -7077,5 +7077,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Outdoor -->
-        <item name="Sports" icon="styles/standard/sport/multi.png" type="node,closedway" preset_name_label="true">
+        <item name="Sports" icon="styles/standard/sport/multi.png" type="node,closedway,multipolygon" preset_name_label="true">
              <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=sports"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=sports"
@@ -7088,5 +7088,5 @@
         </item> <!-- Sports -->
         <separator/>
-        <item name="Dry Cleaning" icon="presets/laundry.png" type="node,closedway" preset_name_label="true">
+        <item name="Dry Cleaning" icon="presets/laundry.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=dry_cleaning"
@@ -7100,5 +7100,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Dry Cleaning -->
-        <item name="Laundry" icon="presets/laundry.png" type="node,closedway" preset_name_label="true">
+        <item name="Laundry" icon="presets/laundry.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=laundry"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=laundry"
@@ -7110,5 +7110,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Laundry -->
-        <item name="Tailor" icon="styles/standard/shop/tailor.png" type="node,closedway" preset_name_label="true">
+        <item name="Tailor" icon="styles/standard/shop/tailor.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tailor"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=tailor" />
@@ -7118,5 +7118,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Tailor -->
-        <item name="Fabric" icon="presets/fabric.png" type="node,closedway" preset_name_label="true">
+        <item name="Fabric" icon="presets/fabric.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=fabric"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=fabric"
@@ -7130,5 +7130,5 @@
     </group> <!-- Clothes -->
     <group name="Electronic" icon="styles/standard/shop/electronics.png">
-        <item name="Computer" icon="styles/standard/shop/computer.png" type="node,closedway" preset_name_label="true">
+        <item name="Computer" icon="styles/standard/shop/computer.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=computer"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=computer"
@@ -7141,5 +7141,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Computer -->
-        <item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway" preset_name_label="true">
+        <item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=electronics"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=electronics"
@@ -7151,5 +7151,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Computer -->
-        <item name="Mobile Phone" icon="presets/mobile_phone.png" type="node,closedway" preset_name_label="true">
+        <item name="Mobile Phone" icon="presets/mobile_phone.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mobile_phone"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=mobile_phone"
@@ -7161,5 +7161,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Mobile Phone -->
-        <item name="Vacuum Cleaner" icon="presets/vacuum_cleaner.png" type="node,closedway" preset_name_label="true">
+        <item name="Vacuum Cleaner" icon="presets/vacuum_cleaner.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=vacuum_cleaner"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=vacuum_cleaner"
@@ -7170,5 +7170,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Vacuum Cleaner -->
-        <item name="Hifi" icon="styles/standard/shop/hifi.svg" type="node,closedway" preset_name_label="true">
+        <item name="Hifi" icon="styles/standard/shop/hifi.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hifi"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=hifi"
@@ -7181,5 +7181,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Hifi -->
-        <item name="Video" icon="styles/standard/shop/video.png" type="node,closedway" preset_name_label="true">
+        <item name="Video" icon="styles/standard/shop/video.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=video"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=video"
@@ -7192,5 +7192,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Video -->
-        <item name="Video Games" icon="styles/standard/shop/video_games.png" type="node,closedway" preset_name_label="true">
+        <item name="Video Games" icon="styles/standard/shop/video_games.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=video_games" />
             <space />
@@ -7199,5 +7199,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Video Games -->
-        <item name="Music" icon="styles/standard/shop/music.svg" type="node,closedway" preset_name_label="true">
+        <item name="Music" icon="styles/standard/shop/music.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=music"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=music"
@@ -7210,5 +7210,5 @@
     </group> <!-- Electronic -->
     <group name="Cash" icon="styles/standard/money/dollar.svg">
-        <item name="Bank" icon="styles/standard/money/bank.png" type="node,closedway" preset_name_label="true">
+        <item name="Bank" icon="styles/standard/money/bank.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=bank"
@@ -7229,5 +7229,5 @@
             <reference ref="link_contact_address" />
         </item> <!-- Bank -->
-        <item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway" preset_name_label="true">
+        <item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bureau_de_change"
@@ -7260,5 +7260,5 @@
             <reference ref="oh_wheelchair" />
         </item> <!-- Automated Teller Machine -->
-        <item name="Pawnbroker" icon="presets/pawnbroker.svg" type="node,closedway" preset_name_label="true">
+        <item name="Pawnbroker" icon="presets/pawnbroker.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=pawnbroker"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=pawnbroker"
@@ -7272,5 +7272,5 @@
     </group> <!-- Cash -->
     <group name="Home decoration" icon="styles/standard/shop/interior_decoration.svg">
-        <item name="Furniture" icon="styles/standard/shop/furniture.png" type="node,closedway" preset_name_label="true">
+        <item name="Furniture" icon="styles/standard/shop/furniture.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=furniture"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=furniture"
@@ -7284,5 +7284,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Furniture -->
-        <item name="Kitchen" icon="presets/kitchen.png" type="node,closedway" preset_name_label="true">
+        <item name="Kitchen" icon="presets/kitchen.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kitchen"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=kitchen"
@@ -7296,5 +7296,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Kitchen -->
-        <item name="Curtain" icon="presets/curtain.png" type="node,closedway" preset_name_label="true">
+        <item name="Curtain" icon="presets/curtain.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=curtain"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=curtain"
@@ -7306,5 +7306,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Curtain -->
-        <item name="Art" icon="styles/standard/shop/art.svg" type="node,closedway" preset_name_label="true">
+        <item name="Art" icon="styles/standard/shop/art.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=art"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=art"
@@ -7317,5 +7317,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Art -->
-        <item name="Frame" icon="presets/frame.png" type="node,closedway" preset_name_label="true">
+        <item name="Frame" icon="presets/frame.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=frame"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=frame"
@@ -7328,5 +7328,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Frame -->
-        <item name="Bed" icon="styles/standard/shop/bed.svg" type="node,closedway" preset_name_label="true">
+        <item name="Bed" icon="styles/standard/shop/bed.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bed"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=bed"
@@ -7340,5 +7340,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Bed -->
-        <item name="Interior Decoration" icon="styles/standard/shop/interior_decoration.svg" type="node,closedway" preset_name_label="true">
+        <item name="Interior Decoration" icon="styles/standard/shop/interior_decoration.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=interior_decoration"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=interior_decoration"
@@ -7350,5 +7350,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Interior Decoration -->
-        <item name="Antiques" icon="styles/standard/shop/antique.svg" type="node,closedway" preset_name_label="true">
+        <item name="Antiques" icon="styles/standard/shop/antique.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=antiques"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=antiques"
@@ -7363,5 +7363,5 @@
     </group> <!-- Home decoration -->
     <group name="Printed Material" icon="presets/stationery.png">
-        <item name="Stationery" icon="presets/stationery.png" type="node,closedway" preset_name_label="true">
+        <item name="Stationery" icon="presets/stationery.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=stationery"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=stationery"
@@ -7374,5 +7374,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Stationery -->
-        <item name="Copy Shop" icon="presets/copyshop.png" type="node,closedway" preset_name_label="true">
+        <item name="Copy Shop" icon="presets/copyshop.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=copyshop"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=copyshop"
@@ -7385,5 +7385,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Copy Shop -->
-        <item name="Book Store" icon="styles/standard/shop/book.svg" type="node,closedway" preset_name_label="true">
+        <item name="Book Store" icon="styles/standard/shop/book.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=books"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=books"
@@ -7398,5 +7398,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Book Store -->
-        <item name="Newspaper Stand" icon="styles/standard/shop/news.svg" type="node,closedway" preset_name_label="true">
+        <item name="Newspaper Stand" icon="styles/standard/shop/news.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=newsagent"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=newsagent"
@@ -7410,5 +7410,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Newspaper Stand -->
-        <item name="Ticket" icon="styles/standard/shop/ticket.svg" type="node,closedway" preset_name_label="true">
+        <item name="Ticket" icon="styles/standard/shop/ticket.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=ticket"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=ticket"
@@ -7422,5 +7422,5 @@
     </group> <!-- Printed Material -->
     <group name="For the body" icon="styles/standard/shop/body.svg">
-        <item name="Chemist" icon="styles/standard/shop/chemist.png" type="node,closedway" preset_name_label="true">
+        <item name="Chemist" icon="styles/standard/shop/chemist.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=chemist"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=chemist"
@@ -7435,5 +7435,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Chemist -->
-        <item name="Cosmetics" icon="styles/standard/shop/cosmetics.svg" type="node,closedway" preset_name_label="true">
+        <item name="Cosmetics" icon="styles/standard/shop/cosmetics.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=cosmetics" />
             <space />
@@ -7442,5 +7442,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Cosmetics -->
-        <item name="Perfumery" icon="styles/standard/shop/perfumery.svg" type="node,closedway" preset_name_label="true">
+        <item name="Perfumery" icon="styles/standard/shop/perfumery.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=perfumery" />
             <space />
@@ -7449,5 +7449,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Perfumery -->
-        <item name="Beauty" icon="styles/standard/shop/beauty.svg" type="node,closedway" preset_name_label="true">
+        <item name="Beauty" icon="styles/standard/shop/beauty.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beauty"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=beauty"
@@ -7462,5 +7462,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Beauty -->
-        <item name="Tobacco" icon="styles/standard/shop/tobacco.svg" type="node,closedway" preset_name_label="true">
+        <item name="Tobacco" icon="styles/standard/shop/tobacco.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tobacco" />
             <space />
@@ -7469,5 +7469,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Tobacco -->
-        <item name="Hairdresser/Barber" icon="styles/standard/shop/hairdresser.png" type="node,closedway" preset_name_label="true">
+        <item name="Hairdresser/Barber" icon="styles/standard/shop/hairdresser.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hairdresser"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=hairdresser"
@@ -7482,5 +7482,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Hairdresser/Barber -->
-        <item name="Tattoo" icon="styles/standard/shop/tattoo.svg" type="node,closedway" preset_name_label="true">
+        <item name="Tattoo" icon="styles/standard/shop/tattoo.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tattoo"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=tattoo"
@@ -7493,5 +7493,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Tattoo -->
-        <item name="Optician" icon="styles/standard/shop/optician.svg" type="node,closedway" preset_name_label="true">
+        <item name="Optician" icon="styles/standard/shop/optician.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=optician"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=optician"
@@ -7504,5 +7504,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Optician -->
-        <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway" preset_name_label="true">
+        <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hearing_aids"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=hearing_aids"
@@ -7514,5 +7514,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Hearing Aids -->
-        <item name="Medical Supply" icon="styles/standard/shop/medical_supply.svg" type="node,closedway" preset_name_label="true">
+        <item name="Medical Supply" icon="styles/standard/shop/medical_supply.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=medical_supply"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=medical_supply"
@@ -7524,5 +7524,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Medical Supply -->
-        <item name="Jewellery" icon="styles/standard/shop/jewelry.png" type="node,closedway" preset_name_label="true">
+        <item name="Jewellery" icon="styles/standard/shop/jewelry.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=jewelry"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=jewelry"
@@ -7535,5 +7535,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Jewellery -->
-        <item name="Erotic" icon="presets/erotic.png" type="node,closedway" preset_name_label="true">
+        <item name="Erotic" icon="presets/erotic.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=erotic"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=erotic"
@@ -7547,5 +7547,5 @@
     </group> <!-- For the body -->
     <group name="Other" icon="styles/standard/shop/mall.png">
-        <item name="Department Store" icon="styles/standard/shop/mall.png" type="node,closedway" preset_name_label="true">
+        <item name="Department Store" icon="styles/standard/shop/mall.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=department_store"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=department_store"
@@ -7560,5 +7560,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Department Store -->
-        <item name="Mall" icon="styles/standard/shop/mall.png" type="node,closedway" preset_name_label="true">
+        <item name="Mall" icon="styles/standard/shop/mall.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mall"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=mall"
@@ -7573,5 +7573,5 @@
         </item> <!-- Mall -->
         <separator/>
-        <item name="Florist" icon="styles/standard/shop/florist.png" type="node,closedway" preset_name_label="true">
+        <item name="Florist" icon="styles/standard/shop/florist.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=florist"
@@ -7586,5 +7586,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Florist -->
-        <item name="Garden Centre" icon="styles/standard/shop/garden_centre.png" type="node,closedway" preset_name_label="true">
+        <item name="Garden Centre" icon="styles/standard/shop/garden_centre.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=garden_centre"
@@ -7600,5 +7600,5 @@
         </item> <!-- Garden Centre -->
         <separator/>
-        <item name="Do-It-Yourself Store" icon="presets/diy_store.png" type="node,closedway" preset_name_label="true">
+        <item name="Do-It-Yourself Store" icon="presets/diy_store.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=doityourself"
@@ -7613,5 +7613,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Do-It-Yourself Store -->
-        <item name="Hardware" icon="presets/hardware.png" type="node,closedway" preset_name_label="true">
+        <item name="Hardware" icon="presets/hardware.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=hardware"
@@ -7624,5 +7624,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Hardware -->
-        <item name="Paint" icon="presets/paint.png" type="node,closedway" preset_name_label="true">
+        <item name="Paint" icon="presets/paint.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=paint"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=paint"
@@ -7636,5 +7636,5 @@
         </item> <!-- Paint -->
         <separator/>
-        <item name="Travel Agency" icon="presets/travel.png" type="node,closedway" preset_name_label="true">
+        <item name="Travel Agency" icon="presets/travel.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=travel_agency"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=travel_agency"
@@ -7646,5 +7646,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Travel Agency -->
-        <item name="Musical Instrument" icon="presets/musical_instrument.png" type="node,closedway" preset_name_label="true">
+        <item name="Musical Instrument" icon="presets/musical_instrument.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=musical_instrument"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=musical_instrument"
@@ -7656,5 +7656,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Musical Instrument -->
-        <item name="Toys" icon="styles/standard/shop/toys.png" type="node,closedway" preset_name_label="true">
+        <item name="Toys" icon="styles/standard/shop/toys.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=toys"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=toys"
@@ -7667,5 +7667,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Toys -->
-        <item name="Gift/Souvenir" icon="presets/present.svg" type="node,closedway" preset_name_label="true">
+        <item name="Gift/Souvenir" icon="presets/present.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=gift"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=gift"
@@ -7684,5 +7684,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Gift/Souvenir -->
-        <item name="Variety Store" icon="presets/variety_store.png" type="node,closedway" preset_name_label="true">
+        <item name="Variety Store" icon="presets/variety_store.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=variety_store"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=variety_store"
@@ -7696,5 +7696,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Variety Store -->
-        <item name="Bookmaker" icon="presets/lottery.svg" type="node,closedway" preset_name_label="true">
+        <item name="Bookmaker" icon="presets/lottery.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bookmaker"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=bookmaker" />
@@ -7704,5 +7704,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Bookmaker -->
-        <item name="Lottery" icon="presets/lottery.svg" type="node,closedway" preset_name_label="true">
+        <item name="Lottery" icon="presets/lottery.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=lottery"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=lottery"
@@ -7713,5 +7713,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Lottery -->
-        <item name="Bag" icon="styles/standard/shop/bag.svg" type="node,closedway" preset_name_label="true">
+        <item name="Bag" icon="styles/standard/shop/bag.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bag"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=bag"
@@ -7722,5 +7722,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Bag -->
-        <item name="Pet" icon="styles/standard/shop/pet.svg" type="node,closedway" preset_name_label="true">
+        <item name="Pet" icon="styles/standard/shop/pet.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=pet"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=pet"
@@ -7734,5 +7734,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Pet -->
-        <item name="Photo" icon="styles/standard/shop/photo.svg" type="node,closedway" preset_name_label="true">
+        <item name="Photo" icon="styles/standard/shop/photo.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=photo"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=photo"
@@ -7743,5 +7743,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Photo -->
-        <item name="Funeral Directors" icon="styles/standard/shop/funeral_directors.svg" type="node,closedway" preset_name_label="true">
+        <item name="Funeral Directors" icon="styles/standard/shop/funeral_directors.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=funeral_directors"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=funeral_directors"
@@ -7830,5 +7830,5 @@
   </group> <!-- Shops -->
   <group name="Offices" icon="styles/standard/office/private_company.svg">
-    <item name="Accountant" icon="styles/standard/office/accountant.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Accountant" icon="styles/standard/office/accountant.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=accountant"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=accountant"
@@ -7841,5 +7841,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Administrative" icon="styles/standard/office/administrative.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Administrative" icon="styles/standard/office/administrative.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=administrative"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=administrative"
@@ -7851,5 +7851,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Advertising agency" icon="styles/standard/office/advertising_agency.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Advertising agency" icon="styles/standard/office/advertising_agency.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=advertising_agency" />
         <space />
@@ -7858,5 +7858,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Architect" icon="styles/standard/office/architect.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Architect" icon="styles/standard/office/architect.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=architect"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=architect"
@@ -7868,5 +7868,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Association" icon="styles/standard/office/association.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Association" icon="styles/standard/office/association.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=association" />
         <space />
@@ -7875,5 +7875,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Private company" icon="styles/standard/office/private_company.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Private company" icon="styles/standard/office/private_company.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=company"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=company"
@@ -7885,5 +7885,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Educational institution" icon="styles/standard/office/educational_institution.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Educational institution" icon="styles/standard/office/educational_institution.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=educational_institution"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=educational_institution"
@@ -7894,5 +7894,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Employment agency" icon="styles/standard/office/employment_agency.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Employment agency" icon="styles/standard/office/employment_agency.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=employment_agency"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=employment_agency"
@@ -7906,5 +7906,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Estate agent" icon="styles/standard/office/real_state.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Estate agent" icon="styles/standard/office/real_state.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=estate_agent"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=estate_agent"
@@ -7918,5 +7918,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Foundation" icon="styles/standard/office/foundation.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Foundation" icon="styles/standard/office/foundation.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=foundation" />
         <space />
@@ -7925,5 +7925,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Government" icon="styles/standard/office/government.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Government" icon="styles/standard/office/government.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=government"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=government"
@@ -7935,5 +7935,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Insurance" icon="styles/standard/office/insurance.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Insurance" icon="styles/standard/office/insurance.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=insurance"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=insurance"
@@ -7946,5 +7946,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="It specialist" icon="styles/standard/office/it.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="It specialist" icon="styles/standard/office/it.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=it"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=it"
@@ -7956,5 +7956,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Lawyer" icon="styles/standard/office/lawyer.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Lawyer" icon="styles/standard/office/lawyer.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=lawyer"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=lawyer"
@@ -7968,5 +7968,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Newspaper" icon="styles/standard/office/newspaper.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Newspaper" icon="styles/standard/office/newspaper.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=newspaper"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=newspaper"
@@ -7978,5 +7978,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Non-governmental organisation (NGO)" icon="styles/standard/office/ong.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Non-governmental organisation (NGO)" icon="styles/standard/office/ong.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=ngo"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:office=ngo"
@@ -7989,5 +7989,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Notary" icon="styles/standard/office/notary.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Notary" icon="styles/standard/office/notary.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=notary" />
         <space />
@@ -7996,5 +7996,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Political party" icon="styles/standard/office/political_party.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Political party" icon="styles/standard/office/political_party.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=political_party"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=political_party"
@@ -8005,5 +8005,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Religion" icon="styles/standard/office/religion.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Religion" icon="styles/standard/office/religion.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=religion"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=religion"
@@ -8015,5 +8015,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Research" icon="styles/standard/office/research.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Research" icon="styles/standard/office/research.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=research"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:office=research"
@@ -8026,5 +8026,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Tax advisor" icon="styles/standard/office/tax_advisor.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Tax advisor" icon="styles/standard/office/tax_advisor.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=tax_advisor"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=tax_advisor" />
@@ -8034,5 +8034,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Telecommunication" icon="styles/standard/office/telecommunication.svg" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Telecommunication" icon="styles/standard/office/telecommunication.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=telecommunication"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=telecommunication"
@@ -8313,5 +8313,5 @@
             <text key="ele" text="Elevation" />
         </item> <!-- Saddle -->
-        <item name="Glacier" icon="presets/glacier.png" type="closedway,relation" preset_name_label="true">
+        <item name="Glacier" icon="presets/glacier.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=glacier"
@@ -8345,5 +8345,5 @@
             </optional>
         </item> <!-- Volcano -->
-        <item name="Ridge" icon="presets/ridge.svg" type="way,relation" preset_name_label="true">
+        <item name="Ridge" icon="presets/ridge.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=ridge"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=ridge"
@@ -8359,5 +8359,5 @@
             <text key="ele" text="Elevation" />
         </item> <!-- Ridge -->
-        <item name="Valley" icon="presets/valley.svg" type="way,relation" preset_name_label="true">
+        <item name="Valley" icon="presets/valley.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=valley"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=valley"
@@ -8370,5 +8370,5 @@
             <reference ref="name_wikipedia" />
         </item> <!-- Valley -->
-        <item name="Cliff" icon="styles/standard/misc/cliff.svg" type="node,way,closedway,relation" preset_name_label="true">
+        <item name="Cliff" icon="styles/standard/misc/cliff.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=cliff"
@@ -8384,5 +8384,5 @@
             <text key="height" text="Height (meters)" />
         </item> <!-- Cliff -->
-        <item name="Cave Entrance" icon="presets/cave_entrance.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Cave Entrance" icon="presets/cave_entrance.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=cave_entrance"
@@ -8401,5 +8401,5 @@
         </item> <!-- Cave Entrance -->
         <separator/>
-        <item name="Island" icon="presets/island.png" type="node,closedway" preset_name_label="true">
+        <item name="Island" icon="presets/island.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=island"
@@ -8412,5 +8412,5 @@
             <reference ref="name_wikipedia" />
         </item> <!-- Island -->
-        <item name="Islet" icon="presets/islet.png" type="node,closedway" preset_name_label="true">
+        <item name="Islet" icon="presets/islet.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=islet"