Index: trunk/src/org/openstreetmap/josm/data/osm/Relation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Relation.java	(revision 9715)
+++ trunk/src/org/openstreetmap/josm/data/osm/Relation.java	(revision 9716)
@@ -420,10 +420,21 @@
     @Override
     public OsmPrimitiveType getDisplayType() {
-        return isMultipolygon() ? OsmPrimitiveType.MULTIPOLYGON
-        : OsmPrimitiveType.RELATION;
-    }
-
+        return isMultipolygon() && !isBoundary() ? OsmPrimitiveType.MULTIPOLYGON : OsmPrimitiveType.RELATION;
+    }
+
+    /**
+     * Determines if this relation is a boundary.
+     * @return {@code true} if a boundary relation
+     */
+    public boolean isBoundary() {
+        return "boundary".equals(get("type"));
+    }
+
+    /**
+     * Determines if this relation behaves as a multipolygon.
+     * @return {@code true} if it's a real mutlipolygon or a boundary relation
+     */
     public boolean isMultipolygon() {
-        return "multipolygon".equals(get("type")) || "boundary".equals(get("type"));
+        return "multipolygon".equals(get("type")) || isBoundary();
     }