diff --git a/src/app/controllers/dashboardNavCtrl.js b/src/app/controllers/dashboardNavCtrl.js
index 94b683e54fa..6f08ffb255e 100644
--- a/src/app/controllers/dashboardNavCtrl.js
+++ b/src/app/controllers/dashboardNavCtrl.js
@@ -127,9 +127,9 @@ function (angular, _, moment, config, store) {
         to = Date.now();
       }
 
-      $scope.filter.setTime({
-        from:moment.utc(from).toDate(),
-        to:moment.utc(to).toDate(),
+      timeSrv.setTime({
+        from: moment.utc(from).toDate(),
+        to: moment.utc(to).toDate(),
       });
     };
 
diff --git a/src/app/controllers/templateEditorCtrl.js b/src/app/controllers/templateEditorCtrl.js
index 731bd433968..16d388b97fd 100644
--- a/src/app/controllers/templateEditorCtrl.js
+++ b/src/app/controllers/templateEditorCtrl.js
@@ -20,7 +20,6 @@ function (angular, _) {
     $scope.init = function() {
       $scope.editor = { index: 0 };
       $scope.datasources = datasourceSrv.getMetricSources();
-      $scope.currentDatasource = _.findWhere($scope.datasources, { default: true });
       $scope.variables = templateSrv.variables;
       $scope.reset();
 
@@ -39,10 +38,8 @@ function (angular, _) {
     };
 
     $scope.add = function() {
-      $scope.current.datasource = $scope.currentDatasource.name;
       $scope.variables.push($scope.current);
-      $scope.reset();
-      $scope.editor.index = 0;
+      $scope.update();
     };
 
     $scope.runQuery = function() {
@@ -52,12 +49,6 @@ function (angular, _) {
     $scope.edit = function(variable) {
       $scope.current = variable;
       $scope.currentIsNew = false;
-      $scope.currentDatasource = _.findWhere($scope.datasources, { name: variable.datasource });
-
-      if (!$scope.currentDatasource) {
-        $scope.currentDatasource = $scope.datasources[0];
-      }
-
       $scope.editor.index = 2;
     };
 
diff --git a/src/app/partials/templating_editor.html b/src/app/partials/templating_editor.html
index 345ba8a5003..f930e153dd8 100644
--- a/src/app/partials/templating_editor.html
+++ b/src/app/partials/templating_editor.html
@@ -18,7 +18,7 @@
 			<div class="editor-row row">
 				<div class="span8">
 					<div ng-if="variables.length === 0">
-						<em>No replacements defined</em>
+						<em>No template variables defined</em>
 					</div>
 					<table class="grafana-options-table">
 						<tr ng-repeat="variable in variables">