diff --git a/lib/Kalamar.pm b/lib/Kalamar.pm
index f435479..0acd510 100644
--- a/lib/Kalamar.pm
+++ b/lib/Kalamar.pm
@@ -63,8 +63,8 @@
       '/sass/alertify.scss',
 
       # CSS files
-      '/css/media.css',
       '/css/font-awesome.min.css',
+      '/css/media.css',
       '/css/highlight.css',
       $self->notifications->styles
     )
diff --git a/lib/Kalamar/Controller/Search.pm b/lib/Kalamar/Controller/Search.pm
index 33185b9..d3cdfb3 100644
--- a/lib/Kalamar/Controller/Search.pm
+++ b/lib/Kalamar/Controller/Search.pm
@@ -7,8 +7,6 @@
 # Query the KorAP backends and render a template
 sub query {
   my $c = shift;
-  $c->layout('default');
-  $c->title('KorAP');
 
   my $query = $c->param('q');
 
diff --git a/lib/Kalamar/Plugin/KalamarTagHelpers.pm b/lib/Kalamar/Plugin/KalamarTagHelpers.pm
index 6041b9c..44d103e 100644
--- a/lib/Kalamar/Plugin/KalamarTagHelpers.pm
+++ b/lib/Kalamar/Plugin/KalamarTagHelpers.pm
@@ -146,7 +146,8 @@
       my $c = shift;
       my $title = shift;
       my $link = shift;
-      my $url = Mojo::URL->new($link);
+      my $host = $c->req->headers->header('X-Forwarded-Host');
+      my $url = $c->url_for($link);
 
       # Link is part of the embedded tutorial
       if ($c->param('embedded')) {