diff --git a/admin/themes/default/js/history.js b/admin/themes/default/js/history.js
index 1d5bd5195..0d0ca9d79 100644
--- a/admin/themes/default/js/history.js
+++ b/admin/themes/default/js/history.js
@@ -169,6 +169,17 @@ function fillSummaryResult(summary) {
   }
 }
 
+function showResults(doShow) {
+  console.log("EMPTY");
+  if (doShow) {
+    $(".search-summary").show();
+    $(".container").show();
+  } else {
+    $(".search-summary").hide();
+    $(".container").hide();
+  }
+}
+
 function fillHistoryResult(ajaxParam) {
   // console.log(current_param);
   // $(".tab .search-line").remove();
@@ -178,8 +189,9 @@ function fillHistoryResult(ajaxParam) {
     dataType: "JSON",
     data: ajaxParam,
     beforeSend: function () {
-      $(".tab .search-line").remove();
+      showResults(false);
       $(".loading").removeClass("hide");
+      $(".noResults").hide();
     },
     success: function (raw_data) {
       
@@ -191,14 +203,21 @@ function fillHistoryResult(ajaxParam) {
 
       //clear lines before refill
       
-      
-      var id = 0;
-      data.forEach(line => {
-        lineConstructor(line, id, imageDisplay)
-        id++
-      });
+      if (data.length > 0) {
+        var id = 0;
+        data.forEach(line => {
+          lineConstructor(line, id, imageDisplay)
+          id++
+        });
+  
+        fillSummaryResult(summary);
+        showResults(true);
+        $(".noResults").hide();
+      } else {
+        showResults(false);
+        $(".noResults").show();
+      }
 
-      fillSummaryResult(summary);
     },
     error: function (e) {
       console.log(e);
diff --git a/admin/themes/default/template/history.tpl b/admin/themes/default/template/history.tpl
index 99d55df8e..d2c6a2051 100644
--- a/admin/themes/default/template/history.tpl
+++ b/admin/themes/default/template/history.tpl
@@ -149,6 +149,12 @@ const guest_id = {$guest_id};
 
 {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
 
+<div class="loading hide"> 
+  <span class="icon-spin6 animate-spin"> </span>
+</div>
+<div class="noResults">
+  {'No results'|@translate}
+</div>
 <div class="container">
   <div class="tab-title">
     <div class="date-title">
@@ -210,9 +216,6 @@ const guest_id = {$guest_id};
     </div>
 
   <div class="tab">
-    <div class="loading hide"> 
-      <span class="icon-spin6 animate-spin"> </span>
-    </div>
   </div>
   <div class="pagination-container">
     <div class="pagination-arrow left">
@@ -278,7 +281,7 @@ jQuery(document).ready( function() {
 <style>
 
 .container {
-  padding: 0 30px;
+  padding: 0 20px;
 }
 
 .container,
@@ -296,6 +299,14 @@ jQuery(document).ready( function() {
   display: none !important;
 }
 
+.noResults {
+  font-size: 14px;
+  display: none;
+  font-weight: bold;
+  color: #777;
+  margin-top: 20px;
+}
+
 .bold {
   font-weight: bold;
 }
diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css
index 23b6e671d..abe56855f 100644
--- a/admin/themes/roma/theme.css
+++ b/admin/themes/roma/theme.css
@@ -1666,7 +1666,7 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
 .search-line .date-section,
 .search-line .user-section,
 .search-line .type-section  {
-  border-right: 1px solid #777;
+  border-right: 1px solid #252525;
 }
 
 .detail-item-1, .detail-item-2, .detail-item-3 {
diff --git a/include/ws_functions/pwg.php b/include/ws_functions/pwg.php
index bddcc78b9..7234bf7d6 100644
--- a/include/ws_functions/pwg.php
+++ b/include/ws_functions/pwg.php
@@ -1012,6 +1012,8 @@ SELECT
 
   unset($name_of_tag);
 
+  sleep(3);
+
   return array(
     'lines'   => $result,
     'params'  => $param,