diff --git a/plugins/datasource-zabbix/partials/query.options.html b/plugins/datasource-zabbix/partials/query.options.html
index a131c83..fa58b31 100644
--- a/plugins/datasource-zabbix/partials/query.options.html
+++ b/plugins/datasource-zabbix/partials/query.options.html
@@ -11,10 +11,10 @@
       <li>
         <input type="text"
                class="input-mini tight-form-input"
-               ng-model="panel.maxDataPoints"
+               ng-model="ctrl.panelCtrl.panel.maxDataPoints"
                bs-tooltip="'Override max data points, automatically set to graph width in pixels.'"
                data-placement="right"
-               ng-model-onblur ng-change="get_data()"
+               ng-model-onblur ng-change="ctrl.panelCtrl.refresh()"
                spellcheck='false'
                placeholder="auto">
       </li>
@@ -27,22 +27,22 @@
         <i class="fa fa-info-circle"></i>
       </li>
       <li class="tight-form-item">
-        <a ng-click="toggleEditorHelp(1)" bs-tooltip="'click to show helpful info'" data-placement="bottom">
+        <a ng-click="ctrl.panelCtrl.toggleEditorHelp(1)" bs-tooltip="'click to show helpful info'" data-placement="bottom">
           Max data points
         </a>
       </li>
       <li class="tight-form-item">
-        <a ng-click="toggleEditorHelp(2)" bs-tooltip="'click to show helpful info'" data-placement="bottom">
+        <a ng-click="ctrl.panelCtrl.toggleEditorHelp(2)" bs-tooltip="'click to show helpful info'" data-placement="bottom">
           IT services
         </a>
       </li>
       <li class="tight-form-item">
-        <a ng-click="toggleEditorHelp(3)" bs-tooltip="'click to show helpful info'" data-placement="bottom">
+        <a ng-click="ctrl.panelCtrl.toggleEditorHelp(3)" bs-tooltip="'click to show helpful info'" data-placement="bottom">
           IT service property
         </a>
       </li>
       <li class="tight-form-item">
-        <a ng-click="toggleEditorHelp(4)" bs-tooltip="'click to show helpful info'" data-placement="bottom">
+        <a ng-click="ctrl.panelCtrl.toggleEditorHelp(4)" bs-tooltip="'click to show helpful info'" data-placement="bottom">
           Text filter
         </a>
       </li>
@@ -54,7 +54,7 @@
 <div class="editor-row">
   <div class="pull-left" style="margin-top: 30px;">
 
-    <div class="grafana-info-box span8" ng-if="editorHelpIndex === 1">
+    <div class="grafana-info-box span8" ng-if="ctrl.panelCtrl.editorHelpIndex === 1">
       <h5>Max data points</h5>
       <ul>
         <li>Grafana-Zabbix plugin uses maxDataPoints parameter to consolidate the real number of values down to this
@@ -67,14 +67,14 @@
       </ul>
     </div>
 
-    <div class="grafana-info-box span8" ng-if="editorHelpIndex === 2">
+    <div class="grafana-info-box span8" ng-if="ctrl.panelCtrl.editorHelpIndex === 2">
       <h5>IT services</h5>
       <ul>
         <li>Select "IT services" in targets menu to activate IT services mode.</li>
       </ul>
     </div>
 
-    <div class="grafana-info-box span8" ng-if="editorHelpIndex === 3">
+    <div class="grafana-info-box span8" ng-if="ctrl.panelCtrl.editorHelpIndex === 3">
       <h5>IT service property</h5>
       <ul>
         <li>Zabbix returns the following availability information about IT service</li>
@@ -86,7 +86,7 @@
       </ul>
     </div>
 
-    <div class="grafana-info-box span8" ng-if="editorHelpIndex === 4">
+    <div class="grafana-info-box span8" ng-if="ctrl.panelCtrl.editorHelpIndex === 4">
       <h5>Text filter</h5>
       <ul>
         <li>Use regex to extract a part of the returned value.</li>