diff --git a/frontend/app/scripts/controllers/SearchCtrl.js b/frontend/app/scripts/controllers/SearchCtrl.js
index d17df0bd04..f9ac71640d 100644
--- a/frontend/app/scripts/controllers/SearchCtrl.js
+++ b/frontend/app/scripts/controllers/SearchCtrl.js
@@ -4,7 +4,7 @@
         .controller('SearchCtrl', function($scope, $q, $stateParams, $uibModal, PSearchSrv, CaseTemplateSrv, CaseTaskSrv, NotificationSrv, EntitySrv, UserSrv, QueryBuilderSrv, GlobalSearchSrv, metadata) {
             $scope.metadata = metadata;
             $scope.toolbar = [
-                {name: 'all', label: 'All', icon: 'glyphicon glyphicon-search'},
+                // {name: 'all', label: 'All', icon: 'glyphicon glyphicon-search'},
                 {name: 'case', label: 'Cases', icon: 'glyphicon glyphicon-folder-open'},
                 {name: 'case_task', label: 'Tasks', icon: 'glyphicon glyphicon-tasks'},
                 {name: 'case_task_log', label: 'Tasks Logs', icon: 'glyphicon glyphicon-comment'},
@@ -23,12 +23,6 @@
             };
 
             $scope.buildBaseFilter = function(entityName) {
-                // var statusCriterion = {
-                //     _not: {
-                //         'status': 'Deleted'
-                //     }
-                // };
-
                 var typeCriterion = {
                   _not: {
                       '_in': {
diff --git a/frontend/app/views/partials/search/list.html b/frontend/app/views/partials/search/list.html
index 65ad680354..df29b01e9c 100644
--- a/frontend/app/views/partials/search/list.html
+++ b/frontend/app/views/partials/search/list.html
@@ -23,7 +23,7 @@ <h3>Search filters <small ng-show="config.entity !== 'all'">{{config[config.enti
             No filters defined. <a href ng-click="addFilter()">Add a filter</a>
         </div> -->
         <form ng-submit="search()">
-            <div class="row">
+            <!-- <div class="row">
                 <div class="col-sm-12 col-md-12 col-lg-8">
                     <div class="input-group">
                         <span class="input-group-btn">
@@ -36,6 +36,11 @@ <h3>Search filters <small ng-show="config.entity !== 'all'">{{config[config.enti
 
                     <hr class="filter-separator" ng-if="config[config.entity].filters.length > 0">
                 </div>
+            </div> -->
+            <div class="row">
+                <div class="col-sm-12 col-md-12col-lg-8">
+                    <p>Please specify your search criterias, by adding your search filters </p>
+                </div>
             </div>
             <div class="row mb-xxxs" ng-repeat="filter in config[config.entity].filters track by $index">
                 <div class="col-sm-4 col-md-4 col-lg-2">
@@ -56,13 +61,14 @@ <h3>Search filters <small ng-show="config.entity !== 'all'">{{config[config.enti
             </div>
             <div class="mv-xs row">
                 <div class="col-sm-12 col-md-12 col-lg-8">
-                    <a href class="btn btn-link btn-clear" ng-click="addFilter()" ng-show="config.entity !== 'all'">
-                        <i class="fa fa-plus"></i> Add a filter
+                    <!-- <a href class="btn btn-link btn-clear" ng-click="addFilter()" ng-show="config.entity !== 'all'"> -->
+                    <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()">
-                        <i class="fa fa-times"></i> Clear
+                    <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">
+                    <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>