diff --git a/plugins/metrics/plugins/metrics/ts/graphs.ts b/plugins/metrics/plugins/metrics/ts/graphs.ts
index f26897c..b03d94b 100755
--- a/plugins/metrics/plugins/metrics/ts/graphs.ts
+++ b/plugins/metrics/plugins/metrics/ts/graphs.ts
@@ -111,9 +111,7 @@ module HawkularMetrics {
                 $scope.vm.startTimeStamp = timeRange[0];
                 $scope.vm.endTimeStamp = timeRange[1];
                 $scope.vm.dateRange = moment(timeRange[0]).from(moment(timeRange[1]));
-                $scope.vm.refreshHistoricalChartDataForTimestamp(startTimeStamp, endTimeStamp);
-
-
+                $scope.vm.refreshHistoricalChartDataForTimestamp(startTimeStamp.getTime(), endTimeStamp.getTime());
             });
 
         }
@@ -135,7 +133,7 @@ module HawkularMetrics {
             toastr.warning('No Data found for id: ' + id);
         }
 
-        private calculatePreviousTimeRange(startDate:Date, endDate:Date):any {
+        private static calculatePreviousTimeRange(startDate:Date, endDate:Date):any {
             var previousTimeRange:Date[] = [];
             var intervalInMillis = endDate.getTime() - startDate.getTime();
 
@@ -145,7 +143,7 @@ module HawkularMetrics {
         }
 
         showPreviousTimeRange():void {
-            var previousTimeRange = this.calculatePreviousTimeRange(this.startTimeStamp, this.endTimeStamp);
+            var previousTimeRange = ChartController.calculatePreviousTimeRange(this.startTimeStamp, this.endTimeStamp);
 
             this.startTimeStamp = previousTimeRange[0];
             this.endTimeStamp = previousTimeRange[1];
@@ -154,7 +152,7 @@ module HawkularMetrics {
         }
 
 
-        private calculateNextTimeRange(startDate:Date, endDate:Date):any {
+        private static calculateNextTimeRange(startDate:Date, endDate:Date):any {
             var nextTimeRange = [];
             var intervalInMillis = endDate.getTime() - startDate.getTime();
 
@@ -165,7 +163,7 @@ module HawkularMetrics {
 
 
         showNextTimeRange():void {
-            var nextTimeRange = this.calculateNextTimeRange(this.startTimeStamp, this.endTimeStamp);
+            var nextTimeRange = ChartController.calculateNextTimeRange(this.startTimeStamp, this.endTimeStamp);
 
             this.startTimeStamp = nextTimeRange[0];
             this.endTimeStamp = nextTimeRange[1];
@@ -175,7 +173,7 @@ module HawkularMetrics {
 
 
         hasNext():boolean {
-            var nextTimeRange = this.calculateNextTimeRange(this.startTimeStamp, this.endTimeStamp);
+            var nextTimeRange = ChartController.calculateNextTimeRange(this.startTimeStamp, this.endTimeStamp);
             // unsophisticated test to see if there is a next; without actually querying.
 
             //@fixme: pay the price, do the query!
@@ -267,7 +265,7 @@ module HawkularMetrics {
 
 
         overlayPreviousRangeData():void {
-            var previousTimeRange = this.calculatePreviousTimeRange(this.startTimeStamp, this.endTimeStamp);
+            var previousTimeRange = ChartController.calculatePreviousTimeRange(this.startTimeStamp, this.endTimeStamp);
 
             if (this.searchId !== '') {
                 this.metricDataService.getMetricsForTimeRange(this.searchId, previousTimeRange[0], previousTimeRange[1])