diff --git a/src/datasource-zabbix/problemsHandler.ts b/src/datasource-zabbix/problemsHandler.ts
index c3c176c..2793793 100644
--- a/src/datasource-zabbix/problemsHandler.ts
+++ b/src/datasource-zabbix/problemsHandler.ts
@@ -86,7 +86,7 @@ export function filterTriggersPre(triggerList, replacedTarget) {
     const tags = utils.parseTags(tagsFilter);
     triggerList = _.filter(triggerList, trigger => {
       return _.every(tags, tag => {
-        return _.includes(trigger.tags, {tag: tag.tag, value: tag.value});
+        return _.find(trigger.tags, t => t.tag === tag.tag && (!tag.value || t.value === tag.value));
       });
     });
   }
diff --git a/src/datasource-zabbix/query.controller.js b/src/datasource-zabbix/query.controller.js
index a3c71a3..4c4eb5c 100644
--- a/src/datasource-zabbix/query.controller.js
+++ b/src/datasource-zabbix/query.controller.js
@@ -117,7 +117,6 @@ export class ZabbixQueryController extends QueryCtrl {
     });
 
     this.init = function() {
-      console.log(this);
       var target = this.target;
 
       // Migrate old targets