diff --git a/src/datasource-zabbix/datasource.ts b/src/datasource-zabbix/datasource.ts
index afc39d4..640c810 100644
--- a/src/datasource-zabbix/datasource.ts
+++ b/src/datasource-zabbix/datasource.ts
@@ -13,7 +13,7 @@ import problemsHandler from './problemsHandler';
 import { Zabbix } from './zabbix/zabbix';
 import { ZabbixAPIError } from './zabbix/connectors/zabbix_api/zabbixAPIConnector';
 import { ZabbixMetricsQuery, ZabbixDSOptions, VariableQueryTypes, ShowProblemTypes, ProblemDTO } from './types';
-import { getBackendSrv } from '@grafana/runtime';
+import { getBackendSrv, getTemplateSrv } from '@grafana/runtime';
 import { DataFrame, DataQueryRequest, DataQueryResponse, DataSourceApi, DataSourceInstanceSettings, FieldType, isDataFrame, LoadingState } from '@grafana/data';
 
 export class ZabbixDatasource extends DataSourceApi<ZabbixMetricsQuery, ZabbixDSOptions> {
@@ -643,6 +643,20 @@ export class ZabbixDatasource extends DataSourceApi<ZabbixMetricsQuery, ZabbixDS
     });
   }
 
+  targetContainsTemplate(target: ZabbixMetricsQuery): boolean {
+    const templateSrv = getTemplateSrv() as any;
+    return (
+      templateSrv.variableExists(target.group?.filter) ||
+      templateSrv.variableExists(target.host?.filter) ||
+      templateSrv.variableExists(target.application?.filter) ||
+      templateSrv.variableExists(target.item?.filter) ||
+      templateSrv.variableExists(target.proxy?.filter) ||
+      templateSrv.variableExists(target.trigger?.filter) ||
+      templateSrv.variableExists(target.textFilter) ||
+      templateSrv.variableExists(target.itServiceFilter)
+    );
+  }
+
   /////////////////
   // Annotations //
   /////////////////
diff --git a/src/datasource-zabbix/types.ts b/src/datasource-zabbix/types.ts
index fe1b438..88ef565 100644
--- a/src/datasource-zabbix/types.ts
+++ b/src/datasource-zabbix/types.ts
@@ -49,6 +49,9 @@ export interface ZabbixMetricsQuery extends DataQuery {
   application: { filter: string; name: string; };
   item: { filter: string; name: string; };
   itemFilter: string;
+  proxy?: { filter: string; };
+  trigger?: { filter: string; };
+  itServiceFilter?: string;
 }
 
 export interface ZabbixQueryOptions {