diff --git a/zabbix/datasource.js b/zabbix/datasource.js
index cd5c0a1..a6cfcbd 100644
--- a/zabbix/datasource.js
+++ b/zabbix/datasource.js
@@ -309,11 +309,17 @@ function (angular, _, kbn) {
       var params = {
         output: ['triggerid', 'description'],
         search: {
-          'description': annotation.query
+          'description': annotation.trigger
         },
         searchWildcardsEnabled: true,
         expandDescription: true
       };
+      if (annotation.host) {
+        params.host = templateSrv.replace(annotation.host);
+      }
+      else if (annotation.group) {
+        params.group = templateSrv.replace(annotation.group);
+      }
 
       return this.zabbixAPI.performZabbixAPIRequest('trigger.get', params)
         .then(function (result) {
diff --git a/zabbix/partials/annotations.editor.html b/zabbix/partials/annotations.editor.html
index 1e9caba..1a95b36 100644
--- a/zabbix/partials/annotations.editor.html
+++ b/zabbix/partials/annotations.editor.html
@@ -1,13 +1,25 @@
 <div class="editor-row">
   <div class="section">
     <h5>Zabbix trigger
-      <tip>Example: Lack of free swap space</tip>
     </h5>
-    <div class="editor-option">
-      <input type="text" class="span10"
-             ng-model="currentAnnotation.query"
-             placeholder="Lack of free swap space">
-    </div>
+  </div>
+</div>
+
+<div class="editor-row">
+  <div class="editor-option">
+    <label class="small">Group</label>
+    <input type="text" class="input-medium" ng-model='currentAnnotation.group'></input>
+  </div>
+  <div class="editor-option">
+    <label class="small">Host</label>
+    <input type="text" class="input-medium" ng-model='currentAnnotation.host'></input>
+  </div>
+  <div class="editor-option">
+    <label class="small">Trigger
+      <tip>Trigger name for search. Wildcards are supports. Examples: Lack of free swap space, Lack of*.
+      </tip>
+    </label>
+    <input type="text" style="width: 25em" ng-model='currentAnnotation.trigger' placeholder="Trigger name"></input>
   </div>
 </div>