diff --git a/lib/Korap/API.pm b/lib/Korap/API.pm
index 70ec277..01bda48 100644
--- a/lib/Korap/API.pm
+++ b/lib/Korap/API.pm
@@ -1,6 +1,6 @@
 package Korap::API;
 use Mojo::Base 'Mojolicious::Plugin';
-use Scalar::Util 'blessed';
+use Scalar::Util qw/blessed weaken/;
 use strict;
 use warnings;
 
@@ -91,6 +91,7 @@
       $url => sub {
 	my $tx = pop;
 	$self->_process_response('matches', $index, $tx);
+	weaken $index;
 	return $cb->($index);
       });
   }
@@ -135,6 +136,7 @@
 
   # non-blocking
   if ($cb) {
+    weaken $index;
 
     # Trace non-blocking
     $ua->start(
@@ -188,6 +190,7 @@
 
   # non-blocking
   if ($cb) {
+    weaken $index;
     $ua->get(
       $url => sub {
 	my $tx = pop;
@@ -242,6 +245,7 @@
   $ua->inactivity_timeout(30);
 
   if ($cb) {
+    weaken $index;
     $ua->get(
       $url => sub {
 	$self->_process_response('resource', $index, pop);
diff --git a/lib/Korap/Controller/Search.pm b/lib/Korap/Controller/Search.pm
index a94f0de..6f1fb74 100644
--- a/lib/Korap/Controller/Search.pm
+++ b/lib/Korap/Controller/Search.pm
@@ -84,7 +84,6 @@
     # Callback for async search
     sub {
       my $index = shift;
-
       return $c->respond_to(
 
 	# Render json if requested
diff --git a/public/sass/hint.scss b/public/sass/hint.scss
index bcf3d85..d67553a 100644
--- a/public/sass/hint.scss
+++ b/public/sass/hint.scss
@@ -23,12 +23,12 @@
 #searchMirror {
   position: absolute;
   margin-top: 1px;
-  white-space: nowrap;
+  white-space: pre-wrap;
   overflow: show;
   height: 0;
   > span {
     opacity: 0;
-    white-space: nowrap;
+    white-space: pre-wrap;
     overflow: hidden;
   }
   > ul {
diff --git a/public/sass/kwic-4.0.scss b/public/sass/kwic-4.0.scss
index a126526..2b8676b 100644
--- a/public/sass/kwic-4.0.scss
+++ b/public/sass/kwic-4.0.scss
@@ -118,17 +118,34 @@
   padding-bottom: 6px;
 }
 
+li {
+  &:not(.active) em > em > em {
+    line-height: 180%;
+  }
+  &.active em > em > em {
+    line-height: 250%;
+  }
+}
+
 .class-1 { border-color: $kwic-highlight-1; }
 .class-2 { border-color: $kwic-highlight-2; }
 .class-3 { border-color: $kwic-highlight-3; }
 .class-4 { border-color: $kwic-highlight-4; }
 
-
+/*
 span.more:before {
   content: "…";
   padding-left: 2pt;
   padding-right: 2pt;
 }
+*/
+
+div.snippet.startMore:before,
+div.snippet.endMore:after {
+  content: "…";
+  padding-left: 2pt;
+  padding-right: 2pt;
+}
 
 /* active view */
 ol > li.active,
diff --git a/templates/match.html.ep b/templates/match.html.ep
index adf5a0e..95055cc 100644
--- a/templates/match.html.ep
+++ b/templates/match.html.ep
@@ -8,7 +8,7 @@
 %#
 %# -- Match information (snippet, morph table, tree information etc.)
   <div>
-    <div class="snippet"><%== $match->{snippet} %></div>
+    <div class="snippet<%= $match->{startMore} ? ' startMore' : '' %><%= $match->{endMore} ? ' endMore' : '' %>"><%== $match->{snippet} %></div>
     <div class="tokenInfo"></div>
 %#    <div class="treeInfo"></div>
   </div>