diff --git a/templates/index.html.ep b/templates/index.html.ep
index e9933a1..f430ffc 100644
--- a/templates/index.html.ep
+++ b/templates/index.html.ep
@@ -39,7 +39,7 @@
      });     
      var urlParams = new URLSearchParams(window.location.search);
      var currentWords = urlParams.get("word");
-     var CIIsearchWords = (currentWords && currentWords.includes(" ") ? '('+currentWords.replace(/ +/g, " oder ")+')' : currentWords);
+     var CIIsearchWords = (currentWords && (currentWords.includes(" ") || currentWords.includes("|")) ? '('+currentWords.replace(/[ |] +/g, " oder ")+')' : currentWords);
      var collocatorTable = null;
      var plainTitle ="<%= $plain_title %>"  
      var korapPath="/";
@@ -321,7 +321,7 @@
          } );
 
          $("td.collocator").click(function(){
-           queryKorAPCII(this.textContent + " /w5 " + CIIsearchWords);
+           queryKorAPCII(this.textContent + " /w1:5,s0 " + CIIsearchWords);
          });
 
          collocatorTable.on( 'order.dt search.dt', function () {