Index: src/org/openstreetmap/josm/resources/data/defaultpresets.xml
===================================================================
--- src/org/openstreetmap/josm/resources/data/defaultpresets.xml    (revision 16137)
+++ src/org/openstreetmap/josm/resources/data/defaultpresets.xml    (working copy)
@@ -1419,14 +1419,14 @@
             <key key="barrier" value="guard_rail" />
             <reference ref="optional_height" />
         </item> <!-- Guard Rail -->
-        <item name="Wall" icon="presets/barrier/wall.svg" type="way,closedway" preset_name_label="true">
+        <item name="Wall" icon="presets/barrier/wall.svg" type="way,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:barrier=wall" />
             <key key="barrier" value="wall" />
             <reference ref="optional_height" />
             <combo key="wall" text="Type" values="castle_wall,dry_stone,flood_wall,noise_barrier,seawall" />
             <reference ref="wall_material" />
         </item> <!-- Wall -->
-        <item name="City Wall" icon="presets/barrier/city_wall.svg" type="way,closedway" preset_name_label="true">
+        <item name="City Wall" icon="presets/barrier/city_wall.svg" type="way,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:barrier=city_wall" />
             <key key="barrier" value="city_wall" />
             <reference ref="optional_height" />
@@ -1699,7 +1699,7 @@
             <space />
             <key key="man_made" value="dyke" />
         </item> <!-- Levee -->
-        <item name="Groyne" icon="presets/nautical/groyne.svg" type="way,closedway" preset_name_label="true">
+        <item name="Groyne" icon="presets/nautical/groyne.svg" type="way,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:man_made=groyne" />
             <key key="man_made" value="groyne" />
         </item> <!-- Groyne -->
@@ -2191,7 +2191,7 @@
             </optional>
         </item> <!-- Zip line -->
         <separator/>
-        <item name="Station" name_context="aerialway" icon="presets/transport/aerialway/station.svg" type="node,closedway" preset_name_label="true">
+        <item name="Station" name_context="aerialway" icon="presets/transport/aerialway/station.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:aerialway=station" />
             <space />
             <key key="aerialway" value="station" />
@@ -2504,8 +2504,8 @@
                 <role key="stop_exit_only" text="stop position (exit only)" requisite="optional" type="node" member_expression="public_transport=stop_position (train=yes OR subway=yes OR monorail=yes OR tram=yes OR light_rail=yes)" />
                 <role key="stop_entry_only" text="stop position (entry only)" requisite="optional" type="node" member_expression="public_transport=stop_position (train=yes OR subway=yes OR monorail=yes OR tram=yes OR light_rail=yes)" />
                 <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
-                <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
-                <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
+                <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
+                <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
                 <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="railway" />
             </roles>
         </item> <!-- Public Transport Route (Rail) -->
@@ -2524,8 +2524,8 @@
                 <role key="stop_exit_only" text="stop position (exit only)" requisite="optional" type="node" member_expression="public_transport=stop_position (bus=yes OR share_taxi=yes OR trolleybus=yes)" />
                 <role key="stop_entry_only" text="stop position (entry only)" requisite="optional" type="node" member_expression="public_transport=stop_position (bus=yes OR share_taxi=yes OR trolleybus=yes)" />
                 <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
-                <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
-                <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
+                <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
+                <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
                 <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway" />
                 <role key="hail_and_ride" text="hail and ride route segment" requisite="optional" type="way,closedway" member_expression="highway" />
             </roles>
@@ -2562,7 +2562,7 @@
                 <role key="stop" text="Stop Position" requisite="optional" type="node" member_expression="public_transport=stop_position" />
                 <role key="platform" text="Platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
                 <role key="" text="Subway Entrance" requisite="optional" type="node" member_expression="railway=subway_entrance" />
-                <role key="" text="Station or amenities" requisite="optional" type="node,way,closedway" member_expression="amenity|public_transport=station" />
+                <role key="" text="Station or amenities" requisite="optional" type="node,way,closedway,multipolygon" member_expression="amenity|public_transport=station" />
             </roles>
         </item> <!-- Stop Area -->
         <separator/>
@@ -2658,7 +2658,7 @@
                 <role key="stop" text="halt point" requisite="optional" type="node" member_expression="highway=bus_stop OR railway=station OR railway=halt OR railway=tram_stop" />
                 <role key="forward_stop" text="forward halt point" requisite="optional" type="node" member_expression="highway=bus_stop OR railway=station OR railway=halt OR railway=tram_stop" />
                 <role key="backward_stop" text="backward halt point" requisite="optional" type="node" member_expression="highway=bus_stop OR railway=station OR railway=halt OR railway=tram_stop" />
-                <role key="platform" text="platform" requisite="optional" type="node,way,closedway" member_expression="highway=platform OR railway=platform" />
+                <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="highway=platform OR railway=platform" />
             </roles>
         </item> <!-- Public transport route (Legacy) -->
         <item name="Station" name_context="railway" icon="presets/transport/railway_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -2736,7 +2736,7 @@
             <reference ref="aerodrome" />
         </item> <!-- Airport Ground -->
         <separator/>
-        <item name="Runway" icon="presets/transport/airport/runway.svg" type="way,closedway" preset_name_label="true">
+        <item name="Runway" icon="presets/transport/airport/runway.svg" type="way,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:aeroway=runway" />
             <key key="aeroway" value="runway" />
             <optional>
@@ -2744,7 +2744,7 @@
                 <reference ref="surface" />
             </optional>
         </item> <!-- Runway -->
-        <item name="Taxiway" icon="presets/transport/airport/taxiway.svg" type="way,closedway" preset_name_label="true">
+        <item name="Taxiway" icon="presets/transport/airport/taxiway.svg" type="way,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:aeroway=taxiway" />
             <key key="aeroway" value="taxiway" />
             <optional>
@@ -2864,7 +2864,7 @@
             <reference ref="link_contact_address_payment" />
             <preset_link preset_name="Building" />
         </item> <!-- Guest House/Bed & Breakfast -->
-        <item name="Apartment" icon="presets/accommodation/apartment.svg" type="node,closedway" preset_name_label="true">
+        <item name="Apartment" icon="presets/accommodation/apartment.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:tourism=apartment" />
             <space />
             <key key="tourism" value="apartment" />
@@ -3337,7 +3337,7 @@
             <reference ref="nudism" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Beach Resort -->
-        <item name="Swimming Pool" icon="presets/sport/swimming.svg" type="node,closedway" preset_name_label="true">
+        <item name="Swimming Pool" icon="presets/sport/swimming.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:leisure=swimming_pool" />
             <key key="leisure" value="swimming_pool" />
             <space />
@@ -4866,7 +4866,7 @@
             </optional>
             <reference ref="link_contact_address" />
         </item> <!-- Non-public police facility -->
-        <item name="Tower" icon="presets/landmark/tower.svg" type="node,closedway" preset_name_label="true">
+        <item name="Tower" icon="presets/landmark/tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:man_made=tower" />
             <space />
             <key key="man_made" value="tower" />
@@ -4906,7 +4906,7 @@
             <reference ref="name_operator" />
             <combo key="product" text="Product" values="lime,charcoal,bricks" />
         </item> <!-- Kiln -->
-        <item name="Windmill" icon="presets/landmark/windmill.svg" type="node,closedway" preset_name_label="true">
+        <item name="Windmill" icon="presets/landmark/windmill.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:man_made=windmill" />
             <space />
             <key key="man_made" value="windmill" />
@@ -5029,7 +5029,7 @@
             <reference ref="ref_operator" />
         </item> <!-- Manhole -->
         <separator/>
-        <item name="Water Tower" icon="presets/landmark/water_tower.svg" type="node,closedway" preset_name_label="true">
+        <item name="Water Tower" icon="presets/landmark/water_tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:man_made=water_tower" />
             <space />
             <key key="man_made" value="water_tower" />
@@ -5050,13 +5050,13 @@
             <key key="man_made" value="wastewater_plant" />
             <text key="name" text="Name" />
         </item> <!-- Wastewater Treatment Plant -->
-        <item name="Watermill" icon="presets/landmark/watermill.svg" type="node,closedway" preset_name_label="true">
+        <item name="Watermill" icon="presets/landmark/watermill.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:man_made=watermill" />
             <space />
             <key key="man_made" value="watermill" />
             <text key="name" text="Name" />
         </item> <!-- Watermill -->
-        <item name="Fountain" icon="presets/misc/fountain.svg" type="node,closedway" preset_name_label="true">
+        <item name="Fountain" icon="presets/misc/fountain.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=fountain" />
             <space />
             <key key="amenity" value="fountain" />
@@ -5075,7 +5075,7 @@
             </optional>
         </item> <!-- Water Well -->
         <separator/>
-        <item name="Lighthouse" icon="presets/landmark/lighthouse.svg" type="node,closedway" preset_name_label="true">
+        <item name="Lighthouse" icon="presets/landmark/lighthouse.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:man_made=lighthouse" />
             <space />
             <key key="man_made" value="lighthouse" />
@@ -5171,14 +5171,14 @@
         </item> <!-- Surveillance Camera -->
     </group> <!-- Man Made -->
     <group name="Bridges" icon="presets/transport/bridge/bridge.svg">
-        <item name="Bridge" icon="presets/transport/bridge/bridge.svg" type="way,relation,multipolygon" preset_name_label="true">
+        <item name="Bridge" icon="presets/transport/bridge/bridge.svg" type="way,multipolygon,relation" preset_name_label="true">
             <link wiki="Key:bridge" />
             <space />
             <combo key="bridge" text="Bridge" values="yes,aqueduct,boardwalk,cantilever,covered,low_water_crossing,trestle,viaduct" match="keyvalue!" default="yes" />
             <combo key="bridge:structure" text="Structure" values="arch,beam,cable-stayed,floating,humpback,simple-suspension,suspension,truss" match="key" />
             <reference ref="optional_bridge" />
         </item> <!-- Bridge -->
-        <item name="Movable Bridge" icon="presets/transport/bridge/bridge_movable.svg" type="way,relation,multipolygon" preset_name_label="true">
+        <item name="Movable Bridge" icon="presets/transport/bridge/bridge_movable.svg" type="way,multipolygon,relation" preset_name_label="true">
             <link wiki="Key:bridge:movable" />
             <space />
             <key key="bridge" value="movable" />
@@ -5228,7 +5228,7 @@
         </item> <!-- Range -->
     </group> <!-- Military -->
     <group name="Power" icon="presets/power/power.svg">
-        <item name="Power Plant" icon="presets/power/plant.svg" type="closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Tag:power=plant" />
             <space />
             <key key="power" value="plant" />
@@ -5504,7 +5504,7 @@
              </optional>
         </item> <!-- Power Street Cabinet -->
         <separator/>
-        <item name="Transformer Tower" icon="presets/power/transformer_tower.svg" type="node,closedway" preset_name_label="true">
+        <item name="Transformer Tower" icon="presets/power/transformer_tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:building=transformer_tower" />
             <space />
             <key key="building" value="transformer_tower" />
@@ -6941,31 +6941,31 @@
         </item> <!-- Maritime -->
     </group> <!-- Boundaries -->
     <group name="Places" icon="presets/place/isolated_dwelling.svg">
-        <item name="Continent" icon="presets/place/capital.svg" type="node,closedway" preset_name_label="true">
+        <item name="Continent" icon="presets/place/capital.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:place=continent" />
             <space />
             <key key="place" value="continent" />
             <reference ref="name_wikipedia" />
         </item> <!-- Continent -->
-        <item name="Country" icon="presets/place/capital.svg" type="node,closedway" preset_name_label="true">
+        <item name="Country" icon="presets/place/capital.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:place=country" />
             <space />
             <key key="place" value="country" />
             <reference ref="name_wikipedia" />
         </item> <!-- Country -->
-        <item name="State" icon="presets/place/capital.svg" name_context="place" type="node,closedway" preset_name_label="true">
+        <item name="State" icon="presets/place/capital.svg" name_context="place" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:place=state" />
             <space />
             <key key="place" value="state" />
             <reference ref="name_wikipedia" />
         </item> <!-- State -->
-        <item name="Region" icon="presets/place/capital.svg" type="node,closedway" preset_name_label="true">
+        <item name="Region" icon="presets/place/capital.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:place=region" />
             <space />
             <key key="place" value="region" />
             <reference ref="name_wikipedia" />
         </item> <!-- Region -->
-        <item name="County" icon="presets/place/capital.svg" type="node,closedway" preset_name_label="true">
+        <item name="County" icon="presets/place/capital.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:place=county" />
             <space />
             <key key="place" value="county" />
@@ -6973,35 +6973,35 @@
             <reference ref="population_postcode_website" />
         </item> <!-- County -->
         <separator/>
-        <item name="City" icon="presets/place/city.svg" type="node,closedway" preset_name_label="true">
+        <item name="City" icon="presets/place/city.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:place=city" />
             <space />
             <key key="place" value="city" />
             <reference ref="name_wikipedia" />
             <reference ref="population_postcode_website" />
         </item> <!-- City -->
-        <item name="Town" icon="presets/place/town.svg" type="node,closedway" preset_name_label="true">
+        <item name="Town" icon="presets/place/town.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:place=town" />
             <space />
             <key key="place" value="town" />
             <reference ref="name_wikipedia" />
             <reference ref="population_postcode_website" />
         </item> <!-- Town -->
-        <item name="Village" icon="presets/place/village.svg" type="node,closedway" preset_name_label="true">
+        <item name="Village" icon="presets/place/village.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:place=village" />
             <space />
             <key key="place" value="village" />
             <reference ref="name_wikipedia" />
             <reference ref="population_postcode_website" />
         </item> <!-- Village -->
-        <item name="Hamlet" icon="presets/place/hamlet.svg" type="node,closedway" preset_name_label="true">
+        <item name="Hamlet" icon="presets/place/hamlet.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:place=hamlet" />
             <space />
             <key key="place" value="hamlet" />
             <reference ref="name_wikipedia" />
             <reference ref="population_postcode_website" />
         </item> <!-- Hamlet -->
-        <item name="Isolated Dwelling" icon="presets/place/isolated_dwelling.svg" type="node,closedway" preset_name_label="true">
+        <item name="Isolated Dwelling" icon="presets/place/isolated_dwelling.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:place=isolated_dwelling" />
             <space />
             <key key="place" value="isolated_dwelling" />
@@ -7009,14 +7009,14 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Isolated Dwelling -->
         <separator/>
-        <item name="Suburb" icon="presets/place/suburb.svg" type="node,closedway" preset_name_label="true">
+        <item name="Suburb" icon="presets/place/suburb.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:place=suburb" />
             <space />
             <key key="place" value="suburb" />
             <reference ref="name_wikipedia" />
             <reference ref="population_postcode_website" />
         </item> <!-- Suburb -->
-        <item name="Quarter" icon="presets/place/quarter.svg" type="node,closedway" preset_name_label="true">
+        <item name="Quarter" icon="presets/place/quarter.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:place=quarter" />
             <space />
             <key key="place" value="quarter" />
@@ -7024,7 +7024,7 @@
             <text key="population" text="Population" />
             <text key="website" text="Website" />
         </item> <!-- Quarter -->
-        <item name="Neighbourhood" icon="presets/place/neighbourhood.svg" type="node,closedway" preset_name_label="true">
+        <item name="Neighbourhood" icon="presets/place/neighbourhood.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:place=neighbourhood" />
             <space />
             <key key="place" value="neighbourhood" />
@@ -7032,7 +7032,7 @@
             <text key="population" text="Population" />
             <text key="website" text="Website" />
         </item> <!-- Neighbourhood -->
-        <item name="Farm" icon="presets/place/farm.svg" type="node,closedway" preset_name_label="true">
+        <item name="Farm" icon="presets/place/farm.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:place=farm" />
             <space />
             <label text="A farm within a bigger settlement" />
@@ -7042,7 +7042,7 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Farm -->
         <separator/>
-        <item name="Locality" icon="presets/place/locality.svg" type="node,closedway" preset_name_label="true">
+        <item name="Locality" icon="presets/place/locality.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:place=locality" />
             <space />
             <key key="place" value="locality" />
@@ -7509,7 +7509,7 @@
     </group> <!-- Landuse -->
   </group> <!-- Geography -->
     <group name="Annotation" icon="presets/misc/housenumber.svg">
-        <item name="Name" icon="presets/misc/name.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Name" icon="presets/misc/name.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Key:name" />
             <space />
             <text key="name" text="Name" />
@@ -7524,7 +7524,7 @@
                 <text key="short_name" text="Common name abbreviation" match="key" />
             </optional>
         </item> <!-- Name -->
-        <item name="Address" icon="presets/misc/housenumber.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Address" icon="presets/misc/housenumber.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Key:addr" />
             <space />
             <text key="addr:housenumber" text="House number" match="key" auto_increment="-2,-1,+1,+2" />
@@ -7555,7 +7555,7 @@
                 <combo key="addr:inclusion" text="Accuracy" values="actual,estimate,potential" match="key" />
             </optional>
         </item> <!-- Address Interpolation -->
-        <item name="Contact (Common Schema)" icon="presets/misc/contact.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Contact (Common Schema)" icon="presets/misc/contact.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Annotations" />
             <space />
             <text key="website" text="Website" match="key" />
@@ -7568,7 +7568,7 @@
             <text key="wikipedia" text="Wikipedia" />
             <text key="image" text="Image" />
         </item> <!-- Contact (Common Schema) -->
-        <item name="Contact (Schema with 'contact:*' Prefix)" icon="presets/misc/contact.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Contact (Schema with 'contact:*' Prefix)" icon="presets/misc/contact.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Key:contact" />
             <space />
             <text key="contact:website" text="Website" match="key" />
@@ -7581,7 +7581,7 @@
             <text key="wikipedia" text="Wikipedia" />
             <text key="image" text="Image" />
         </item> <!-- Contact (Schema with 'contact:*' Prefix) -->
-        <item name="Description" icon="presets/misc/description.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Description" icon="presets/misc/description.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Key:description" />
             <space />
             <label text="A short text with additional information." text_context="description=*" />
@@ -7593,7 +7593,7 @@
             <preset_link preset_name="Note" />
             <preset_link preset_name="Fixme" />
         </item> <!-- Description -->
-        <item name="Note" icon="presets/misc/note.svg" name_context="the tag note=*" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Note" icon="presets/misc/note.svg" name_context="the tag note=*" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Key:note" />
             <space />
             <label text="An important hint for other mappers (not for the end user)." text_context="note=*" />
@@ -7604,7 +7604,7 @@
             <preset_link preset_name="Fixme" />
             <preset_link preset_name="Description" />
         </item> <!-- Note -->
-        <item name="Fixme" icon="presets/misc/fixme.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Fixme" icon="presets/misc/fixme.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Key:fixme" />
             <space />
             <label text="A hint for other mappers (not for the end user), that an object needs an improvement."  text_context="fixme=*"/>
@@ -7617,7 +7617,7 @@
         </item> <!-- Fixme -->
     </group> <!-- Annotation -->
     <group name="Relations" icon="presets/misc/relations.svg">
-        <item name="Multipolygon" icon="presets/misc/multipolygon.svg" type="relation,multipolygon" preset_name_label="true">
+        <item name="Multipolygon" icon="presets/misc/multipolygon.svg" type="multipolygon,relation" preset_name_label="true">
             <link wiki="Relation:multipolygon" />
             <key key="type" value="multipolygon" />
             <optional>
@@ -7628,7 +7628,7 @@
                 <role key="inner" text="inner segment" requisite="optional" type="way,closedway" />
             </roles>
         </item> <!-- Multipolygon -->
-        <item name="Boundary" icon="presets/misc/boundaries.svg" type="relation,multipolygon" preset_name_label="true">
+        <item name="Boundary" icon="presets/misc/boundaries.svg" type="multipolygon,relation" preset_name_label="true">
             <link wiki="Relation:boundary" />
             <space />
             <key key="type" value="boundary" />
@@ -7940,9 +7940,9 @@
             <text key="name" text="Name" />
             <roles>
                 <role key="street" text="ways being part of street" requisite="required" type="way" />
-                <role key="address" text="addresses belonging to the street" requisite="optional" type="node,way,closedway" />
-                <role key="house" text="houses belonging to the street" requisite="optional" type="node,way,closedway" />
-                <role key="associated" text="anything related to the street" requisite="optional" type="node,way,closedway" />
+                <role key="address" text="addresses belonging to the street" requisite="optional" type="node,way,closedway,multipolygon" />
+                <role key="house" text="houses belonging to the street" requisite="optional" type="node,way,closedway,multipolygon" />
+                <role key="associated" text="anything related to the street" requisite="optional" type="node,way,closedway,multipolygon" />
             </roles>
         </item> <!-- Street -->
         <item name="Destination Sign" icon="presets/misc/information/guidepost.svg" type="relation" preset_name_label="true">