when clicking on drug last drug name was used (not the current)

frontend-js/src/main/js/map/window/AbstractInfoWindow.js

@@ -32,19 +32,17 @@ function AbstractInfoWindow(params) {
   var onOverlayFullViewChanged = function(e) {
     var self = e.object;
     // first change the content of the element
-    return self.update().then(
-        function() {
-          if (e.newVal) {
-            var element = new IdentifiedElement({
-              objectId : self.getElementId(),
-              modelId : self.getCustomMap().getId(),
-              type : self.getElementType()
-            });
-
-            return self.getCustomMap().getTopMap().retrieveOverlayDetailDataForElement(element,
-                self.getOverlayFullViewArray());
-          }
+    return self.update().then(function() {
+      if (e.newVal) {
+        var element = new IdentifiedElement({
+          objectId : self.getElementId(),
+          modelId : self.getCustomMap().getId(),
+          type : self.getElementType()
         });
+        var topMap = self.getCustomMap().getTopMap();
+        return topMap.retrieveOverlayDetailDataForElement(element, self.getOverlayFullViewArray());
+      }
+    });
 
   };
 
@@ -480,6 +478,11 @@ AbstractInfoWindow.prototype._createTableForTargetDiv = function(data, overlay)
   table.appendChild(header);
   var row;
 
+  var onclick = function() {
+    // ';' enforces single query (in case there are ',' characters in the name)
+    return overlay.searchByQuery(this.innerHTML + ";");
+  };
+
   var count = 0;
   for ( var searchId in data) {
     if (data.hasOwnProperty(searchId)) {
@@ -501,9 +504,7 @@ AbstractInfoWindow.prototype._createTableForTargetDiv = function(data, overlay)
       }
       var link = Functions.createElement({
         type : "a",
-        onclick : function(drug) {
-          return overlay.searchByQuery(nameContent);
-        },
+        onclick : onclick,
         href : "#",
         content : nameContent,
       });