diff --git a/src/datasource-zabbix/datasource.js b/src/datasource-zabbix/datasource.js
index 932920d..7f04e80 100644
--- a/src/datasource-zabbix/datasource.js
+++ b/src/datasource-zabbix/datasource.js
@@ -378,7 +378,7 @@ export class ZabbixAPIDatasource {
           return self.zabbixAPI
             .getEvents(objectids, timeFrom, timeTo, showOkEvents)
             .then(events => {
-              var indexedTriggers = _.indexBy(triggers, 'triggerid');
+              var indexedTriggers = _.groupBy(triggers, 'triggerid');
 
               // Hide acknowledged events if option enabled
               if (annotation.hideAcknowledged) {
diff --git a/src/datasource-zabbix/queryProcessor.service.js b/src/datasource-zabbix/queryProcessor.service.js
index 557b2f1..6931468 100644
--- a/src/datasource-zabbix/queryProcessor.service.js
+++ b/src/datasource-zabbix/queryProcessor.service.js
@@ -230,7 +230,7 @@ angular.module('grafana.services').factory('QueryProcessor', function($q) {
 
       // Group history by itemid
       var grouped_history = _.groupBy(history, 'itemid');
-      var hosts = _.indexBy(_.flatten(_.map(items, 'hosts')), 'hostid');
+      var hosts = _.groupBy(_.flatten(_.map(items, 'hosts')), 'hostid');
 
       return _.map(grouped_history, function(hist, itemid) {
         var item = _.find(items, {'itemid': itemid});
diff --git a/src/datasource-zabbix/zabbixCache.service.js b/src/datasource-zabbix/zabbixCache.service.js
index e4c9868..9970568 100644
--- a/src/datasource-zabbix/zabbixCache.service.js
+++ b/src/datasource-zabbix/zabbixCache.service.js
@@ -117,7 +117,7 @@ angular.module('grafana.services').factory('ZabbixCachingProxy', function($q, $i
       var deferred  = this.$q.defer();
       var historyStorage = this.storage.history;
       var full_history;
-      var expired = _.filter(_.indexBy(items, 'itemid'), function(item, itemid) {
+      var expired = _.filter(_.groupBy(items, 'itemid'), function(item, itemid) {
         return !historyStorage[itemid];
       });
       if (expired.length) {