diff --git a/src/components/RegisterEvents.js b/src/components/RegisterEvents.js
index bac88a9372846d1cdefb0d813fbec3e0cebe3032..fc3a3b14abd59f338d08554d7d1e5f8d6e23d80a 100644
--- a/src/components/RegisterEvents.js
+++ b/src/components/RegisterEvents.js
@@ -1,24 +1,22 @@
 const delegate = require('./Delegate');
 
+const SearchPath = require('./SearchPath');
+
 const RegisterEvents = function (state) {
 
   delegate('#app', 'click', '#search-text', async () => {
     const search = document.querySelector('#text-to-search');
-    window.location.hash = `#search/${state.main.start}/${state.main.page}/${search.value}`;
+    window.location.hash = SearchPath.toURI(state.main.currentSearch, { 'main_search': search.value }).substr(1);
   });
 
   delegate('#app', 'keyup', '#text-to-search', async (event) => {
     if (event.keyCode === 13) {
       event.preventDefault();
       const search = document.querySelector('#text-to-search');
-      window.location.hash = `#search/${state.main.start}/${state.main.page}/${search.value}`;
+      window.location.hash = SearchPath.toURI(state.main.currentSearch, { 'main_search': search.value }).substr(1);
     }
   });
 
-  delegate('#app', 'click', '#search-text-1', async () => {
-    const search = document.querySelector('#text-to-search');
-    window.location.hash = `#search/${state.main.start}/${state.main.page}/${search.value}`;
-  });
 };
 
 module.exports = RegisterEvents;
\ No newline at end of file
diff --git a/src/components/views/ListDocs.js b/src/components/views/ListDocs.js
index b41585309d1f93534f91e141d54a4077c18695b9..d202dfa6c3bfd245791f3dfcb2767afcfe8c512f 100644
--- a/src/components/views/ListDocs.js
+++ b/src/components/views/ListDocs.js
@@ -16,7 +16,7 @@ const ListDocs = function (data) {
         </li>`;
     });
   } else {
-    html += `<div class="text-center"> No data found</div>`;
+    html += `<div class="text-center">No search results</div>`;
   }
   html += `</ul><div><br/></div>`;
   html += `</div></div>`;