diff --git a/www/assets/js/ng/controller_tagVals.js b/www/assets/js/ng/controller_tagVals.js
index b27878b..e96a893 100644
--- a/www/assets/js/ng/controller_tagVals.js
+++ b/www/assets/js/ng/controller_tagVals.js
@@ -4,21 +4,23 @@ poconsole.controller('tagValsCtrl', function($scope, $route, $http, $routeParams
 	$log.info({routeParams:$routeParams});
     var colors = ['#d7191c','#fdae61','#abdda4','#2b83ba'];
 
-    if ($routeParams.endDatetime){
-        $scope.endDatetime = Date.parse(dateConversion.sqliteDate($routeParams.endDatetime));
-    } else {
+    if (!$routeParams.endDatetime){
         $scope.endDatetime = new Date();
+    } else {
+		$scope.endDatetime = Date.parse(dateConversion.sqliteDate($routeParams.endDatetime));
     }
 
-    if ($routeParams.startDatetime){
-        $scope.startDatetime = Date.parse(dateConversion.sqliteDate($routeParams.startDatetime));
-    } else {
+    if (!$routeParams.startDatetime){
         $scope.startDatetime = new Date();
         $scope.startDatetime.setHours($scope.endDatetime.getHours() - 2);
+    } else {
+		$scope.startDatetime = Date.parse(dateConversion.sqliteDate($routeParams.startDatetime));
     }
     $log.info({start: $scope.startDatetime, end:$scope.endDatetime});
 
     $scope.loadTagVals = function(sDTime, eDTime){
+		$scope.startDatetime = sDTime;
+		$scope.endDatetime = eDTime;
 		$log.info({start: sDTime, end:eDTime});
         $scope.loading = true;
         var tags_to_get = $routeParams.tagID.split(",");
diff --git a/www/config/blueprints.js b/www/config/blueprints.js
index 0bee92f..d6f051b 100644
--- a/www/config/blueprints.js
+++ b/www/config/blueprints.js
@@ -157,6 +157,6 @@ module.exports.blueprints = {
   *                                                                           *
   ****************************************************************************/
 
-  // defaultLimit: 30
+  defaultLimit: 20000
 
 };