=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java	2012-11-10 15:09:47 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java	2012-11-19 19:06:56 +0000
@@ -156,7 +156,7 @@
     @Override
     public String getName()
     {
-        return uid;
+        return indicator != null ? indicator.getName() : dataElement != null ? dataElement.getName() : uid;
     }
     
     @JsonProperty