=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2013-10-08 17:58:45 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2013-10-11 14:29:28 +0000
@@ -162,20 +162,12 @@
 				for (var i = 0; i < layers.length; i++) {
 					var layer = layers[i],
 						id = layer.id,
-						legendConfig = layer.core.getLegendConfig(),
 						imageLegendConfig = layer.core.getImageLegendConfig(),
 						what,
 						when,
 						where,
 						legend;
 
-					// Html encode
-					for (var key in legendConfig) {
-						if (legendConfig.hasOwnProperty(key)) {
-							legendConfig[key] = Ext.htmlEncode(legendConfig[key]);
-						}
-					}
-
 					// SVG
 					svgArray.push(layer.div.innerHTML);
 
@@ -183,19 +175,13 @@
 					if (id !== gis.layer.boundary.id && id !== gis.layer.facility.id) {
 						what = '<g id="indicator" style="display: block; visibility: visible;">' +
 							   '<text id="indicator" x="' + x + '" y="' + y + '" font-size="12">' +
-							   '<tspan>' + legendConfig.what + '</tspan></text></g>';
+							   '<tspan>' + layer.core.view.columns[0].items[0].name + '</tspan></text></g>';
 
 						y += 15;
 
 						when = '<g id="period" style="display: block; visibility: visible;">' +
 							   '<text id="period" x="' + x + '" y="' + y + '" font-size="12">' +
-							   '<tspan>' + legendConfig.when + '</tspan></text></g>';
-
-						y += 15;
-
-						where = '<g id="period" style="display: block; visibility: visible;">' +
-							   '<text id="period" x="' + x + '" y="' + y + '" font-size="12">' +
-							   '<tspan>' + legendConfig.where + '</tspan></text></g>';
+							   '<tspan>' + layer.core.view.filters[0].items[0].name + '</tspan></text></g>';
 
 						y += 8;