diff --git a/src/datasource-zabbix/partials/query.editor.html b/src/datasource-zabbix/partials/query.editor.html
index 72f6b73..50342cd 100644
--- a/src/datasource-zabbix/partials/query.editor.html
+++ b/src/datasource-zabbix/partials/query.editor.html
@@ -89,7 +89,6 @@
       <input type="text"
         ng-model="ctrl.target.group.filter"
         bs-typeahead="ctrl.getGroupNames"
-        ng-change="ctrl.onTargetPartChange(ctrl.target.group)"
         ng-blur="ctrl.onTargetBlur()"
         data-min-length=0
         data-items=100
@@ -106,7 +105,6 @@
       <input type="text"
         ng-model="ctrl.target.host.filter"
         bs-typeahead="ctrl.getHostNames"
-        ng-change="ctrl.onTargetPartChange(ctrl.target.host)"
         ng-blur="ctrl.onTargetBlur()"
         data-min-length=0
         data-items=100
@@ -123,26 +121,7 @@
         change="ctrl.onTargetBlur()">
       </editor-checkbox>
     </li>
-
-    <!-- Downsampling function -->
-    <!-- <li class="tight-form-item input-medium" ng-hide="ctrl.target.mode == 2">
-      Downsampling
-    </li>
-    <li ng-hide="ctrl.target.mode == 2">
-      <select class="tight-form-input input-small"
-              ng-change="ctrl.targetBlur()"
-              ng-model="ctrl.target.downsampleFunction"
-              bs-tooltip="'Downsampling function'"
-              ng-options="func.name for func in downsampleFunctionList track by func.name">
-      </select>
-      <a bs-tooltip="ctrl.target.errors.metric"
-         style="color: rgb(229, 189, 28)"
-         ng-show="ctrl.target.errors.metric">
-        <i class="icon-warning-sign"></i>
-      </a>
-    </li> -->
   </ul>
-
   <div class="clearfix"></div>
 </div>
 
@@ -156,7 +135,6 @@
       <input type="text"
         ng-model="ctrl.target.application.filter"
         bs-typeahead="ctrl.getApplicationNames"
-        ng-change="ctrl.onTargetPartChange(ctrl.target.application)"
         ng-blur="ctrl.onTargetBlur()"
         data-min-length=0
         data-items=100
@@ -173,7 +151,6 @@
       <input type="text"
         ng-model="ctrl.target.item.filter"
         bs-typeahead="ctrl.getItemNames"
-        ng-change="ctrl.onTargetPartChange(ctrl.target.item)"
         ng-blur="ctrl.onTargetBlur()"
         data-min-length=0
         data-items=100
diff --git a/src/datasource-zabbix/query.controller.js b/src/datasource-zabbix/query.controller.js
index 88453f2..3556209 100644
--- a/src/datasource-zabbix/query.controller.js
+++ b/src/datasource-zabbix/query.controller.js
@@ -178,26 +178,12 @@ export class ZabbixQueryController extends QueryCtrl {
     }
   }
 
-  onTargetPartChange(targetPart) {
-    /*var regexStyle = {'color': '#CCA300'};
-    targetPart.isRegex = utils.isRegex(targetPart.filter);
-    targetPart.style = targetPart.isRegex ? regexStyle : {};*/
-  }
-
   isRegex(str) {
     return utils.isRegex(str);
   }
 
   isVariable(str) {
-    var variablePattern = /^\$\w+/;
-    if (variablePattern.test(str)) {
-      var variables = _.map(this.templateSrv.variables, variable => {
-        return '$' + variable.name;
-      });
-      return _.contains(variables, str);
-    } else {
-      return false;
-    }
+    return utils.isTemplateVariable(str, this.templateSrv.variables);
   }
 
   onTargetBlur() {
diff --git a/src/datasource-zabbix/utils.js b/src/datasource-zabbix/utils.js
index 77ca3bc..5925da0 100644
--- a/src/datasource-zabbix/utils.js
+++ b/src/datasource-zabbix/utils.js
@@ -29,6 +29,18 @@ export function isRegex(str) {
   return regexPattern.test(str);
 }
 
+export function isTemplateVariable(str, templateVariables) {
+  var variablePattern = /^\$\w+/;
+  if (variablePattern.test(str)) {
+    var variables = _.map(templateVariables, variable => {
+      return '$' + variable.name;
+    });
+    return _.contains(variables, str);
+  } else {
+    return false;
+  }
+}
+
 export function buildRegex(str) {
   var matches = str.match(regexPattern);
   var pattern = matches[1];
diff --git a/src/panel-triggers/editor.js b/src/panel-triggers/editor.js
index 448328a..3e1b6ff 100644
--- a/src/panel-triggers/editor.js
+++ b/src/panel-triggers/editor.js
@@ -141,15 +141,7 @@ class TriggerPanelEditorCtrl {
   }
 
   isVariable(str) {
-    var variablePattern = /^\$\w+/;
-    if (variablePattern.test(str)) {
-      var variables = _.map(this.templateSrv.variables, variable => {
-        return '$' + variable.name;
-      });
-      return _.contains(variables, str);
-    } else {
-      return false;
-    }
+    return utils.isTemplateVariable(str, this.templateSrv.variables);
   }
 }