diff --git a/src/app/panels/filtering/module.html b/src/app/panels/filtering/module.html
index 86526d15258..3f987fdeb02 100644
--- a/src/app/panels/filtering/module.html
+++ b/src/app/panels/filtering/module.html
@@ -2,7 +2,7 @@
 
   <div class='filtering-container'>
 
-    <div ng-repeat="filter in filterSrv.list" class="small filter-panel-filter">
+    <div ng-repeat="filter in filterList" class="small filter-panel-filter">
       <div>
         <i class="filter-action pointer icon-remove" bs-tooltip="'Remove'" ng-click="remove(filter)"></i>
         <i class="filter-action pointer icon-edit" ng-hide="filter.editing" bs-tooltip="'Edit'" ng-click="filter.editing = true"></i>
@@ -17,7 +17,7 @@
             </a>
               <ul class="dropdown-menu">
                 <li ng-repeat="option in filter.options">
-                  <a ng-click="filterSrv.filterOptionSelected(filter, option)">{{option.text}}</a>
+                  <a ng-click="filterOptionSelected(filter, option)">{{option.text}}</a>
                 </li>
               </ul>
           </li>
@@ -40,9 +40,8 @@
           </li>
         </ul>
         <div>
-          <input type="submit" value="Apply" ng-click="applyFilter(filter)" class="filter-apply btn btn-success btn-mini" bs-tooltip="'Save and refresh'"/>
-
-          <button ng-click="filter.editing=undefined" class="filter-apply btn btn-mini" bs-tooltip="'Save without refresh'">Save</button>
+          <input type="submit" value="Update" ng-click="applyFilter(filter)" class="filter-apply btn btn-success btn-mini" bs-tooltip="'Update and refresh'"/>
+          <button ng-click="filter.editing=undefined" class="filter-apply btn btn-mini" bs-tooltip="'Save without refresh'">Close</button>
         </div>
       </form>
     </div>
diff --git a/src/app/panels/filtering/module.js b/src/app/panels/filtering/module.js
index 9fc84471085..6c1e6b47962 100644
--- a/src/app/panels/filtering/module.js
+++ b/src/app/panels/filtering/module.js
@@ -27,15 +27,33 @@ function (angular, app, _) {
     _.defaults($scope.panel,_d);
 
     $scope.init = function() {
-      $scope.filterSrv = filterSrv;
+      $scope.filterList = filterSrv.list;
     };
 
     $scope.remove = function(filter) {
       filterSrv.remove(filter);
     };
 
+    $scope.filterOptionSelected = function(filter, option) {
+      filterSrv.filterOptionSelected(filter, option);
+      $scope.applyFilterToOtherFilters(filter);
+    };
+
+    $scope.applyFilterToOtherFilters = function(updatedFilter) {
+      _.each($scope.filterList, function(filter) {
+        if (filter === updatedFilter) {
+          return;
+        }
+        if (filter.query.indexOf(updatedFilter.name) !== -1) {
+          $scope.applyFilter(filter);
+        }
+      });
+    };
+
     $scope.applyFilter = function(filter) {
-      datasourceSrv.default.metricFindQuery(filter.query)
+      var query = filterSrv.applyFilterToTarget(filter.query);
+
+      datasourceSrv.default.metricFindQuery(query)
         .then(function (results) {
           filter.editing=undefined;
           filter.options = _.map(results, function(node) {
diff --git a/src/app/services/all.js b/src/app/services/all.js
index b4f17ad3491..2f2ecfb3543 100644
--- a/src/app/services/all.js
+++ b/src/app/services/all.js
@@ -1,10 +1,10 @@
 define([
   './alertSrv',
   './dashboard',
+  './datasourceSrv',
   './filterSrv',
   './timer',
   './panelMove',
-  './datasourceSrv',
   './keyboardManager',
   './annotationsSrv',
   './playlistSrv',