diff --git a/frontend/app/views/directives/entity-link.html b/frontend/app/views/directives/entity-link.html
index 748cdaa916..3aa18188b4 100644
--- a/frontend/app/views/directives/entity-link.html
+++ b/frontend/app/views/directives/entity-link.html
@@ -1,11 +1,17 @@
+<!-- <span ng-if="value._type == 'alert'">
+    <a class="text-muted wrap" href ng-click="onClickEvent({value: value})">
+        <i class="glyphicon glyphicon-folder-open"></i>
+        &nbsp;{{value.title}}&nbsp;
+    </a>
+</span> -->
 <span ng-if="value._type == 'case'">
-    <a class="text-muted wrap"href ng-click="openLink(entityUrl(value))">
+    <a class="text-muted wrap" href ng-click="openLink(entityUrl(value))">
         <i class="glyphicon glyphicon-folder-open"></i>
         &nbsp;#{{value.caseId || value.number}} - {{value.title}}&nbsp;
     </a>
 </span>
 <span ng-if="value._type == 'Case'">
-    <a class="text-muted wrap"href ng-click="openLink(entityUrl(value))">
+    <a class="text-muted wrap" href ng-click="openLink(entityUrl(value))">
         <i class="glyphicon glyphicon-folder-open"></i>
         &nbsp;#{{value.caseId || value.number}} - {{value.title}}&nbsp;
     </a>
@@ -28,7 +34,9 @@
     <entity-link value="value.case_task" target="target"></entity-link>
     <i class="text-muted wrap" class="glyphicon glyphicon-comment"></i>
 </span>
-<span ng-if="value._type == 'case_artifact'">
+<span ng-if="value._type == 'case_artifact' && value.case">
+    <!-- <entity-link ng-if="value.alert" value="value.alert" target="target"></entity-link> -->
+    <!-- <entity-link ng-if="value.case" value="value.case" target="target"></entity-link> -->
     <entity-link value="value.case" target="target"></entity-link>
     <a class="text-muted wrap" href ng-click="openLink(entityUrl(value))">
         <i class="glyphicon glyphicon-pushpin"></i>
diff --git a/frontend/app/views/directives/search/observable.html b/frontend/app/views/directives/search/observable.html
index f86a2770eb..2d2790601c 100644
--- a/frontend/app/views/directives/search/observable.html
+++ b/frontend/app/views/directives/search/observable.html
@@ -1,4 +1,4 @@
-<div class="search-item-title">
+<div ng-if="value.case" class="search-item-title">
     <a href ui-sref="app.case.observables-item({caseId: value.case.id, itemId: value.id})">
         [<span ng-bind="value.dataType"></span>]:
         <em>
@@ -7,15 +7,44 @@
         </em>
     </a>
 </div>
+<div ng-if="value.alert" class="search-item-title">
+    <span ng-if="value.alert" ng-click="onTitleClicked({value: value.alert})">
+        <a href>
+            [<span ng-bind="value.dataType"></span>]:
+            <em>
+                <span ng-if="!value.attachment.name" ng-bind="value.data"></span>
+                <span ng-if="value.attachment.name" ng-bind="value.attachment.name"></span>
+            </em>
+        </a>
+    </span>
+</div>
 <div>
     <i class="glyphicon glyphicon-user"></i>
     <user-info value="value.createdBy" field="name"></user-info>
 
     <i class="glyphicon glyphicon-calendar ml-xxs"></i>
     <span ng-bind="value.startDate | shortDate"></span>
+
+    <span ng-if="value.alert">
+        <i class="fa fa-certificate ml-xxs"></i> Type:
+        <span>{{value.alert.type}}</span>
+
+        <i class="fa fa-barcode ml-xxs"></i> Reference:
+        <span>{{value.alert.sourceRef}}</span>
+
+        <i class="fa fa-bullseye ml-xxs"></i> Source:
+        <span>{{value.alert.source}}</span>
+    </span>
 </div>
+
+<div class="mt-xs wrap" ng-if="value.alert">
+    <strong>Alert:</strong><br>
+    <span>{{value.alert.title}}</span>
+</div>
+
 <div class="mt-xs wrap" ng-if="value.tags.length>0">
-    <strong>Tags:</strong><tag-list data="value.tags"></tag-list>
+    <strong>Tags:</strong>
+    <tag-list data="value.tags"></tag-list>
 </div>
 <div class="mt-xs wrap">
     <span ng-bind="(value.message || 'No Description') | limitTo: 250"></span>
diff --git a/frontend/app/views/partials/search/list.html b/frontend/app/views/partials/search/list.html
index 8782940eae..f4a0ec5849 100644
--- a/frontend/app/views/partials/search/list.html
+++ b/frontend/app/views/partials/search/list.html
@@ -6,17 +6,19 @@ <h3 class="box-title">Search result ({{searchResults.total}} records(s) found)</
         <h3>Search scope</h3>
     </div>
     <div class="m-xs entity-bar">
-        <div class="entity-item" ng-repeat="item in toolbar" ng-click="setEntity(item.name)" ng-class="{'active': config.entity===item.name}">
-          <div class="entity-item-icon">
-              <i ng-class="item.icon"></i>
-          </div>
-          <div class="entity-item-text">
-              {{item.label}}
-          </div>
+        <div class="entity-item" ng-repeat="item in toolbar" ng-click="setEntity(item.name)"
+            ng-class="{'active': config.entity===item.name}">
+            <div class="entity-item-icon">
+                <i ng-class="item.icon"></i>
+            </div>
+            <div class="entity-item-text">
+                {{item.label}}
+            </div>
         </div>
     </div>
     <div class="m-xs text-primary">
-        <h3>Search filters <small ng-show="config.entity !== 'all'">{{config[config.entity].filters.length || 0 }} filter(s) applied</small></h3>
+        <h3>Search filters <small ng-show="config.entity !== 'all'">{{config[config.entity].filters.length || 0 }}
+                filter(s) applied</small></h3>
     </div>
     <div class="m-xs">
         <!-- <div ng-if="!config[config.entity].search && !config[config.entity].filters.length > 0" class="empty-message">
@@ -65,10 +67,12 @@ <h3>Search filters <small ng-show="config.entity !== 'all'">{{config[config.enti
                     <a href class="btn btn-default" ng-click="addFilter()" ng-show="config.entity !== 'all'">
                         <i class="fa fa-plus"></i> Add filter
                     </a>
-                    <a href class="btn btn-danger" ng-click="clearFilters()" ng-show="config[config.entity].filters.length > 0">
+                    <a href class="btn btn-danger" ng-click="clearFilters()"
+                        ng-show="config[config.entity].filters.length > 0">
                         <i class="fa fa-times"></i> Clear filters
                     </a>
-                    <button href class="btn btn-primary pull-right" type="submit" ng-show="config[config.entity].filters.length > 0">
+                    <button href class="btn btn-primary pull-right" type="submit"
+                        ng-show="config[config.entity].filters.length > 0">
                         <i class="fa fa-search"></i> Search
                     </button>
                 </div>
@@ -81,19 +85,27 @@ <h3>Search Result <small>{{searchResults.total}} records(s) found</small></h3>
     <div class="box-body">
         <div class="row">
             <psearch control="searchResults"></psearch>
-            <div class="col-md-12" ng-if="searchResults && (!searchResults.values || searchResults.values.length === 0)">
+            <div class="col-md-12"
+                ng-if="searchResults && (!searchResults.values || searchResults.values.length === 0)">
                 <div class="empty-message">
                     No result found.
                 </div>
             </div>
             <div class="col-md-12" ng-repeat="value in searchResults.values" ng-switch="value._type">
-                <search-item type="case" value="value" ng-switch-when="case" icon="glyphicon glyphicon-folder-open"></search-item>
-                <search-item type="task" value="value" ng-switch-when="case_task" icon="glyphicon glyphicon-tasks"></search-item>
-                <search-item type="task-log" value="value" ng-switch-when="case_task_log" icon="glyphicon glyphicon-comment"></search-item>
-                <search-item type="observable" value="value" ng-switch-when="case_artifact" icon="glyphicon glyphicon-pushpin"></search-item>
-                <search-item type="observable-job" value="value" ng-switch-when="case_artifact_job" icon="glyphicon glyphicon-cog"></search-item>
-                <search-item type="alert" value="value" ng-switch-when="alert" icon="glyphicon glyphicon-alert" on-title-clicked="importAlert(value)"></search-item>
-                <search-item type="audit" value="value" ng-switch-when="audit" icon="glyphicon glyphicon-list-alt"></search-item>
+                <search-item type="case" value="value" ng-switch-when="case" icon="glyphicon glyphicon-folder-open">
+                </search-item>
+                <search-item type="task" value="value" ng-switch-when="case_task" icon="glyphicon glyphicon-tasks">
+                </search-item>
+                <search-item type="task-log" value="value" ng-switch-when="case_task_log"
+                    icon="glyphicon glyphicon-comment"></search-item>
+                <search-item type="observable" value="value" ng-switch-when="case_artifact"
+                    icon="glyphicon glyphicon-pushpin" on-title-clicked="importAlert(value)"></search-item>
+                <search-item type="observable-job" value="value" ng-switch-when="case_artifact_job"
+                    icon="glyphicon glyphicon-cog"></search-item>
+                <search-item type="alert" value="value" ng-switch-when="alert" icon="glyphicon glyphicon-alert"
+                    on-title-clicked="importAlert(value)"></search-item>
+                <search-item type="audit" value="value" ng-switch-when="audit" icon="glyphicon glyphicon-list-alt">
+                </search-item>
             </div>
             <psearch control="searchResults"></psearch>
         </div>