diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ebcafedd18..3384d5af7f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ vNext
 
 **Fixes**
 - Fix formatting negative values (PR #545)
-
+- Fix for Max legend value when max value is zero (Issue #460)
 
 # 1.6.1 (2014-06-24)
 
diff --git a/src/app/directives/grafanaGraph.js b/src/app/directives/grafanaGraph.js
index ae33815dbed..b9091cce8bf 100755
--- a/src/app/directives/grafanaGraph.js
+++ b/src/app/directives/grafanaGraph.js
@@ -340,7 +340,7 @@ function (angular, $, kbn, moment, _) {
             if (seriesInfo.alias) {
               group = '<small style="font-size:0.9em;">' +
                 '<i class="icon-circle" style="color:'+item.series.color+';"></i>' + ' ' +
-                (decodeURIComponent(seriesInfo.alias)) +
+                seriesInfo.alias +
               '</small><br>';
             } else {
               group = kbn.query_color_dot(item.series.color, 15) + ' ';
diff --git a/src/app/panels/graph/module.html b/src/app/panels/graph/module.html
index f5f300711f3..f414b19bd79 100644
--- a/src/app/panels/graph/module.html
+++ b/src/app/panels/graph/module.html
@@ -3,28 +3,6 @@
       style="min-height:{{panel.height || row.height}}"
       ng-class="{'panel-fullscreen': fullscreen}">
 
-<!--   <table style="width: 100%">
-    <tr>
-    <td style="width: 100%">
-      <div style="position: relative">
-
-        <div ng-if="datapointsWarning" class="datapoints-warning">
-          <span class="small" ng-show="!datapointsCount">No datapoints <tip>Can be caused by timezone mismatch between browser and graphite server</tip></span>
-          <span class="small" ng-show="datapointsOutside">Datapoints outside time range <tip>Can be caused by timezone mismatch between browser and graphite server</tip></span>
-        </div>
-
-        <div grafana-graph class="pointer histogram-chart">
-        </div>
-
-      </div>
-    </td>
-    <td>
-      <div ng-if="panel.legend.show" ng-include="'app/panels/graph/legend.html'">
-      </div>
-    </td>
-    </tr>
-  </table> -->
-
   <div class="graph-wrapper" ng-class="{'graph-legend-rightside': panel.legend.rightSide}">
       <div class="graph-canvas-wrapper">
 
@@ -56,4 +34,4 @@
       <div ng-include src="tab.src"></div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/panels/graph/timeSeries.js b/src/app/panels/graph/timeSeries.js
index 7bf692c789d..d7a8a2125de 100644
--- a/src/app/panels/graph/timeSeries.js
+++ b/src/app/panels/graph/timeSeries.js
@@ -20,17 +20,21 @@ function (_, kbn) {
     this.yaxis = this.info.yaxis;
 
     this.info.total = 0;
-    this.info.max = null;
+    this.info.max = -212312321312;
     this.info.min = 212312321312;
 
-    _.each(this.datapoints, function(valueArray) {
-      var currentTime = valueArray[1];
-      var currentValue = valueArray[0];
+    var ignoreNulls = fillStyle === 'connected';
+    var nullAsZero = fillStyle === 'null as zero';
+    var currentTime;
+    var currentValue;
+
+    for (var i = 0; i < this.datapoints.length; i++) {
+      currentValue = this.datapoints[i][0];
+      currentTime = this.datapoints[i][1];
+
       if (currentValue === null) {
-        if (fillStyle === 'connected') {
-          return;
-        }
-        if (fillStyle === 'null as zero') {
+        if (ignoreNulls) { continue; }
+        if (nullAsZero) {
           currentValue = 0;
         }
       }
@@ -48,7 +52,7 @@ function (_, kbn) {
       }
 
       result.push([currentTime * 1000, currentValue]);
-    }, this);
+    }
 
     if (result.length > 2) {
       this.info.timeStep = result[1][0] - result[0][0];