=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js	2015-02-24 15:35:20 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js	2015-03-02 17:05:55 +0000
@@ -9715,4 +9715,3 @@
         });
 	}();
 });
-

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js	2015-02-25 14:51:26 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js	2015-03-02 17:05:55 +0000
@@ -224,13 +224,17 @@
         layer.registerMouseDownEvent = function() {
 
             // clear mousedown listeners
-            if (layer.events && layer.events.listeners && Ext.isArray(layer.events.listeners.mousedown)) {
-                layer.events.listeners.mousedown = [];
-            }
+            //if (layer.events && layer.events.listeners && Ext.isArray(layer.events.listeners.mousedown)) {
+                //layer.events.listeners.mousedown = [];
+            //}
 
             layer.events.register('mousedown', null, layer.onMouseDown);
         };
 
+        layer.unregisterMouseDownEvent = function() {
+            layer.events.unregister('mousedown', null, layer.onMouseDown);
+        };
+
 		defaultHoverSelect = function fn(feature) {
             if (isBoundary) {
                 var style = layer.core.getDefaultFeatureStyle();
@@ -274,6 +278,12 @@
 
 		defaultHoverUnselect = function fn(feature) {
 			defaultHoverWindow.destroy();
+
+            // remove mouse click event
+            if (layer.events && layer.events.listeners && Ext.isArray(layer.events.listeners.mousedown)) {
+                layer.events.listeners.mousedown = [];
+            }
+            //layer.unregisterMouseDownEvent();
 		};
 
         defaultLeftClickSelect = function fn(feature, e) {