diff --git a/templates/index.html.ep b/templates/index.html.ep
index 5c38c77..139ada8 100644
--- a/templates/index.html.ep
+++ b/templates/index.html.ep
@@ -731,13 +731,14 @@
     <div id="topwrapper">
       <div style="visibility: hidden;" id="tabs">
         <ul>
-          % if($distantWords) {
+          % if($mergedEnd && $distantWords) {
           <li><a href="#tabs-0" title="Cos offsets of the words furthest away from their position in the reference corpus."">Offsets</a></li>
           % }
           <li><a href="#tabs-1">Semantics (TSNE-map)</a></li>
           <li><a href="#tabs-2">Semantics (SOM)</a></li>
           <li><a href="#tabs-3">Syntagmatic (collocates)</a></li>
         </ul>
+        % if($mergedEnd && $distantWords) {
         <div id="tabs-0" style="display: flex;  padding: 5px; flex-flow: row wrap;">
           <div id="vocabdist" style="width: 230px; margin-bottom: 15px;">
             <table class="display compact nowrap" id="vocabdistt">
@@ -758,6 +759,7 @@
             </table>
           </div>
         </div>
+        % }
         <div id="tabs-1" style="display: flex;  padding: 5px; flex-flow: row wrap;">
           % if($lists && (@$lists) > 0 && (@$lists)[0]) {
             <div id="wrapper">
diff --git a/w2v-server.pl b/w2v-server.pl
index 2ec8c40..a8cb8d0 100755
--- a/w2v-server.pl
+++ b/w2v-server.pl
@@ -845,6 +845,9 @@
   knn *nbs = NULL;
   int N = 1000;
 
+  if(merged_end == 0)
+    result = "[]";
+    
   if(result != NULL)
     return result;