diff --git a/zabbix/partials/query.editor.html b/zabbix/partials/query.editor.html
index f1985fd..57709fb 100644
--- a/zabbix/partials/query.editor.html
+++ b/zabbix/partials/query.editor.html
@@ -59,7 +59,7 @@
                   ng-change="selectHostGroup()"
                   ng-model="target.group"
                   bs-tooltip="target.group.name.length > 25 ? target.group.name : ''"
-                  ng-options="group.visible_name ? group.visible_name : group.name for group in metric.groupList" >
+                  ng-options="group.visible_name ? group.visible_name : group.name for group in metric.groupList track by group.name" >
               <option value="">-- Select host group --</option>
           </select>
           <a bs-tooltip="target.errors.metric"
@@ -75,7 +75,7 @@
                     ng-change="selectHost()"
                     ng-model="target.host"
                     bs-tooltip="target.host.name.length > 25 ? target.host.name : ''"
-                    ng-options="host.visible_name ? host.visible_name : host.name for host in metric.hostList" >
+                    ng-options="host.visible_name ? host.visible_name : host.name for host in metric.hostList track by host.name" >
                 <option value="">-- Select host --</option>
             </select>
             <a bs-tooltip="target.errors.metric"
@@ -91,7 +91,7 @@
                     ng-change="selectApplication()"
                     ng-model="target.application"
                     bs-tooltip="target.application.name.length > 15 ? target.application.name : ''"
-                    ng-options="app.visible_name ? app.visible_name : app.name for app in metric.applicationList" >
+                    ng-options="app.visible_name ? app.visible_name : app.name for app in metric.applicationList track by app.name" >
                 <option value="">-- Select application --</option>
             </select>
             <a bs-tooltip="target.errors.metric"
@@ -107,7 +107,7 @@
                     ng-change="selectItem()"
                     ng-model="target.item"
                     bs-tooltip="target.name.length > 30 ? target.name : ''"
-                    ng-options="item.name for item in metric.itemList" >
+                    ng-options="item.name for item in metric.itemList track by item.name" >
                 <option value="">-- Select item --</option>
             </select>
             <a bs-tooltip="target.errors.metric"
diff --git a/zabbix/queryCtrl.js b/zabbix/queryCtrl.js
index e88c07e..e166d96 100644
--- a/zabbix/queryCtrl.js
+++ b/zabbix/queryCtrl.js
@@ -131,15 +131,8 @@ function (angular, _) {
       $scope.metric.groupList = [{name: '*', visible_name: 'All'}];
       addTemplatedVariables($scope.metric.groupList);
 
-      $scope.datasource.performHostGroupSuggestQuery().then(function (series) {
-        $scope.metric.groupList = $scope.metric.groupList.concat(series);
-
-        if ($scope.target.group) {
-          $scope.target.group = $scope.metric.groupList.filter(function (item, index, array) {
-            // Find selected host in metric.hostList
-            return item.name == $scope.target.group.name;
-          }).pop();
-        }
+      $scope.datasource.performHostGroupSuggestQuery().then(function (groups) {
+        $scope.metric.groupList = $scope.metric.groupList.concat(groups);
       });
     };
 
@@ -154,13 +147,6 @@ function (angular, _) {
       var groups = $scope.target.group ? splitMetrics(templateSrv.replace($scope.target.group.name)) : undefined;
       $scope.datasource.hostFindQuery(groups).then(function (hosts) {
         $scope.metric.hostList = $scope.metric.hostList.concat(hosts);
-
-        if ($scope.target.host) {
-          $scope.target.host = $scope.metric.hostList.filter(function (item, index, array) {
-            // Find selected host in metric.hostList
-            return item.name == $scope.target.host.name;
-          }).pop();
-        }
       });
     };
 
@@ -180,13 +166,6 @@ function (angular, _) {
           return {name: appname};
         });
         $scope.metric.applicationList = $scope.metric.applicationList.concat(apps);
-
-        if ($scope.target.application) {
-          $scope.target.application = $scope.metric.applicationList.filter(function (app) {
-            // Find selected application in metric.hostList
-            return app.name == $scope.target.application.name;
-          }).pop();
-        }
       });
     };
 
@@ -214,12 +193,6 @@ function (angular, _) {
             item.name = expandItemName(item);
           }
         });
-        if ($scope.target.item) {
-          $scope.target.item = $scope.metric.itemList.filter(function (item, index, array) {
-            // Find selected item in metric.hostList
-            return item.name == $scope.target.item.name;
-          }).pop();
-        }
       });
     };