diff --git a/src/module.html b/src/module.html
index e893738..052468a 100644
--- a/src/module.html
+++ b/src/module.html
@@ -3,8 +3,8 @@
         <div ng-if="sensor.visible">
             <div ng-style="{position: 'relative', left:sensor.xlocationStr, top:sensor.ylocationStr, 'font-size':sensor.sizeStr,color:sensor.color}">
                 <div ng-style="{position: 'absolute', top: 0, left: 0,'background-color': sensor.bgcolor,'border-style':'solid','border-color':sensor.bordercolor,'border-width':'1px',padding:'5px'}">
-                    <a href="{{sensor.link_url}}" bs-tooltip="sensor.link_hover" style="color: {{sensor.color}}">
-                        {{sensor.valueFormatted}} {{sensor.valueUnit}}
+                    <a ng-if="ctrl.sensorValues[sensor.name]" href="{{sensor.link_url}}" bs-tooltip="sensor.link_hover" style="color: {{sensor.color}}">
+                        {{ctrl.sensorValues[sensor.name]}} {{sensor.valueUnit}}
                     </a>
                 </div>
             </div>
diff --git a/src/pictureit_ctrl.js b/src/pictureit_ctrl.js
index dbfcb1f..992189e 100644
--- a/src/pictureit_ctrl.js
+++ b/src/pictureit_ctrl.js
@@ -20,7 +20,7 @@ export class PictureItCtrl extends MetricsPanelCtrl  {
   constructor($scope, $injector) {
     super($scope, $injector);
     _.defaults(this.panel, panelDefaults);
-
+    this.sensorValues = new Object();
     this.unitFormats = kbn.getUnitFormats();
 
     this.events.on('init-edit-mode', this.onInitEditMode.bind(this));
@@ -30,10 +30,11 @@ export class PictureItCtrl extends MetricsPanelCtrl  {
   }
 
   onDataReceived(dataList) {	
+    this.sensorValues = new Object();
 	var dataListLength = dataList.length;
-	this.panel.valueMaps=[];
 	for (var series=0;series<dataListLength;series++) {		
-		this.panel.valueMaps.push({name:dataList[series].target,value:dataList[series].datapoints[dataList[series].datapoints.length-1][0]});
+    var data = dataList[series];
+    this.sensorValues[data.target] = data.datapoints[data.datapoints.length-1][0];
 	}
 	
     this.render();
@@ -54,7 +55,7 @@ export class PictureItCtrl extends MetricsPanelCtrl  {
   }
   
   setUnitFormat(subItem, index) {
-  	this.panel.sensors[index].format = subItem.value;
+    this.panel.sensors[index].format = subItem.value;
   }
 
   onInitEditMode() {
@@ -88,11 +89,10 @@ export class PictureItCtrl extends MetricsPanelCtrl  {
             sensors[sensor].ylocationStr=sensors[sensor].ylocation.toString()+"px";
             sensors[sensor].xlocationStr=sensors[sensor].xlocation.toString()+"px";
             sensors[sensor].sizeStr=sensors[sensor].size.toString()+"px";
-            for (var valueMap=0;valueMap<valueMapsLength;valueMap++) {	
-                if (sensors[sensor].name==valueMaps[valueMap].name) {
-                    sensors[sensor].valueFormatted = kbn.valueFormats[sensors[sensor].format](valueMaps[valueMap].value,sensors[sensor].decimals, null);
-		break;
-		}
+            var name = sensors[sensor].name;
+            if(ctrl.sensorValues.hasOwnProperty(name)) {
+              var value = ctrl.sensorValues[name];
+              ctrl.sensorValues[name] = kbn.valueFormats[sensors[sensor].format](value, sensors[sensor].decimals, null);
             }
 	}
     }