diff --git a/static/abaev.js b/static/abaev.js
index 405a589..44aa781 100644
--- a/static/abaev.js
+++ b/static/abaev.js
@@ -1,4 +1,9 @@
 $( document ).ready(function() {
+    // Link elements that do not have href out of the box
+    $('.link').on("click", function () {
+      window.location=$(this)[0].dataset.href+window.location.search+window.location.hash;
+    });
+
     function bindMapOpen() {
         // $('#modal_map').data('abv-entry',$(this).data('abv-entry'));
         // $('#modal_map')[0].showModal();
diff --git a/xq/restx_dict_cached.xq b/xq/restx_dict_cached.xq
index 25772f4..02445c1 100644
--- a/xq/restx_dict_cached.xq
+++ b/xq/restx_dict_cached.xq
@@ -55,13 +55,15 @@ declare function page:header($lang as xs:string, $href-other as xs:string) {
             <li>{
               (element {if ($lang = 'ru') then 'mark' else 'a'}{
                 if ($lang != 'ru') then
-                (attribute onclick {`window.location='{$href-other}'+window.location.search;`},
+                (attribute class {'link'},
+                attribute data-href {`{$href-other}`},
                 attribute href {'#'}) else (),
                 'ru'
               }, ' / ',
               element {if ($lang = 'ru') then 'a' else 'mark'}{
                 if ($lang = 'ru') then 
-                (attribute onclick {`window.location='{$href-other}'+window.location.search;`},
+                (attribute class {'link'},
+                attribute data-href {`{$href-other}`},
                 attribute href {'#'}) else (),
                 'en'
               })
@@ -113,7 +115,7 @@ declare function page:header($lang as xs:string, $href-other as xs:string) {
                 else
                 (
                 if (session:get('searchN') > 1) then
-                <button type="button" onclick="location.href='./search/prev'">
+                <button type="button" class="link" data-href="./search/prev">
                   <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-left" viewBox="0 0 16 16">
                     <path fill-rule="evenodd" d="M15 8a.5.5 0 0 0-.5-.5H2.707l3.147-3.146a.5.5 0 1 0-.708-.708l-4 4a.5.5 0 0 0 0 .708l4 4a.5.5 0 0 0 .708-.708L2.707 8.5H14.5A.5.5 0 0 0 15 8"/>
                   </svg>              
@@ -121,7 +123,7 @@ declare function page:header($lang as xs:string, $href-other as xs:string) {
                 <button disabled="true">{session:get('searchN')}/{array:size(session:get('searchData'))}</button>
                 ,
                 if (session:get('searchN') and session:get('searchN') < array:size(session:get('searchData'))) then
-                <button type="button" onclick="location.href='./search/next'">
+                <button type="button" class="link" data-href="./search/next">
                   <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-right" viewBox="0 0 16 16">
                     <path fill-rule="evenodd" d="M1 8a.5.5 0 0 1 .5-.5h11.793l-3.147-3.146a.5.5 0 0 1 .708-.708l4 4a.5.5 0 0 1 0 .708l-4 4a.5.5 0 0 1-.708-.708L13.293 8.5H1.5A.5.5 0 0 1 1 8"/>
                   </svg>
@@ -550,6 +552,10 @@ declare %rest:path("{$lang}/dict")
           <footer><button class="abv-close-map">Close</button></footer>
         </article>
       </dialog>
+      
+      {if (session:get('searchQuery')) then 
+      <dialog id="modal_searchResults">
+      </dialog>}
     </body>
   </html>
 };