diff --git a/zabbix/datasource.js b/zabbix/datasource.js
index 283295e..ff249c4 100644
--- a/zabbix/datasource.js
+++ b/zabbix/datasource.js
@@ -633,6 +633,11 @@ function (angular, _, kbn) {
               select_acknowledges: 'extend'
             };
 
+            // Show problem events only
+            if (!annotation.showOkEvents) {
+              params.value = 1;
+            }
+
             return self.performZabbixAPIRequest('event.get', params)
               .then(function (result) {
                 var events = [];
@@ -712,9 +717,15 @@ function getShortTime(date) {
 }
 
 
+/**
+ * Format acknowledges.
+ *
+ * @param  {array} acknowledges array of Zabbix acknowledge objects
+ * @return {string} HTML-formatted table
+ */
 function formatAcknowledges(acknowledges) {
   if (acknowledges.length) {
-    var formatted_acknowledges = '<br><br>Acknowledges:<br><table border="1"><tr><td><b>Time</b></td><td><b>User</b></td><td><b>Comments</b></td></tr>';
+    var formatted_acknowledges = '<br><br>Acknowledges:<br><table><tr><td><b>Time</b></td><td><b>User</b></td><td><b>Comments</b></td></tr>';
     _.each(_.map(acknowledges, function (ack) {
       var time = new Date(ack.clock * 1000);
       return '<tr><td><i>' + getShortTime(time) + '</i></td><td>' + ack.alias + ' (' + ack.name+ ' ' + ack.surname + ')' + '</td><td>' + ack.message + '</td></tr>';
diff --git a/zabbix/partials/annotations.editor.html b/zabbix/partials/annotations.editor.html
index eb65f53..1ca3d78 100644
--- a/zabbix/partials/annotations.editor.html
+++ b/zabbix/partials/annotations.editor.html
@@ -2,7 +2,15 @@
 	<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"></input>
+			<input type="text" class="span10" ng-model="currentAnnotation.query" placeholder="Lack of free swap space"></input>
 		</div>
 	</div>
 </div>
+
+<div class="editor-row">
+  <div class="section">
+    <h5>Options</h5>
+    <input type="checkbox" class="cr1" id="currentAnnotation.okEvents" ng-model="currentAnnotation.okEvents" ng-checked="currentAnnotation.okEvents">
+    <label for="currentAnnotation.okEvents" class="cr1">Show OK events <tip>Show events, generated when trigger release to OK state</tip></label>
+  </div>
+</div>