diff --git a/zabbix/datasource.js b/zabbix/datasource.js
index ec0798a..a036043 100644
--- a/zabbix/datasource.js
+++ b/zabbix/datasource.js
@@ -301,11 +301,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 = annotation.host;
+      }
+      else if (annotation.group) {
+        params.group = 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 2b98557..eef6f78 100644
--- a/zabbix/partials/annotations.editor.html
+++ b/zabbix/partials/annotations.editor.html
@@ -1,37 +1,31 @@
 <div class="editor-row">
   <div class="section">
     <h5>Zabbix trigger
-      <tip>Example: Lack of free swap space</tip>
     </h5>
     <div class="editor-option">
-      <label class="small">Name</label>
-      <input type="text" class="tight-form-input input-large"
-             ng-model="currentAnnotation.group"
-             placeholder="Lack of free swap space">
       <div class="tight-form">
         <ul class="tight-form-list" role="menu">
           <!-- Host Group -->
-          <li class="tight-form-item input-small" style="width: 5em">Group</li>
+          <li class="tight-form-item input-small" style="width: 4em">Group</li>
           <li>
-            <input type="text" class="tight-form-input input-large"
-                   ng-model="currentAnnotation.group"
-                   placeholder="Lack of free swap space">
+            <input type="text" class="tight-form-input input-medium"
+                   ng-model="currentAnnotation.group">
           </li>
           <!-- Host -->
           <li class="tight-form-item input-small" style="width: 3em">Host</li>
           <li>
-            <input type="text" class="tight-form-input input-large"
-                   ng-model="currentAnnotation.host"
-                   placeholder="Lack of free swap space">
+            <input type="text" class="tight-form-input input-medium"
+                   ng-model="currentAnnotation.host">
           </li>
           <!-- Trigger filter -->
-          <li class="tight-form-item">
+          <li class="tight-form-item input-small">
             Trigger
             <i class="fa fa-question-circle"
-               bs-tooltip="'Filtering hosts by regex. Select All in items and specify regex for host names.'"></i>
+               bs-tooltip="'Zabbix trigger name or regex for search. Example: Lack of free swap space'"></i>
           </li>
           <li>
             <input type="text" class="tight-form-input input-large"
+                   style="width: 20em"
                    ng-model="currentAnnotation.trigger"
                    spellcheck='false'
                    placeholder="Trigger filter (regex)"