Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 11594)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 11600)
@@ -1353,8 +1353,10 @@
      */
     public final boolean hasAreaTags() {
-        return hasKey("landuse")
+        return hasKey("landuse", "amenity", "leisure", "building", "building:part")
                 || "yes".equals(get("area"))
                 || "riverbank".equals(get("waterway"))
-                || hasKey("natural", "amenity", "leisure", "building", "building:part");
+                || hasTag("natural", "water", "wood", "scrub", "wetland", "grassland", "heath", "rock", "bare_rock",
+                                     "sand", "beach", "scree", "bay", "glacier", "shingle", "fell", "reef", "stone",
+                                     "mud", "landslide", "sinkhole", "crevasse", "desert");
     }