diff --git a/lib/Pooru/Site/Controller/Media.pm b/lib/Pooru/Site/Controller/Media.pm
index 6f824d0..b208a3c 100644
--- a/lib/Pooru/Site/Controller/Media.pm
+++ b/lib/Pooru/Site/Controller/Media.pm
@@ -6,14 +6,10 @@ sub list ($self)
 	my $v = $self->validation;
 
 	my $page = $v->optional("page")->num(1, undef)->param // 1;
-	return $self->render(
-		status => 400
-	) if $v->has_error;
+	return $self->render(status => 400) if $v->has_error;
 
 	my $tags = $v->optional("tags")->param;
-	return $self->render(
-		status => 400
-	) if $v->has_error;
+	return $self->render(status => 400) if $v->has_error;
 
 	$self->title($tags) if defined($tags) && $tags ne "";
 
@@ -48,9 +44,7 @@ sub show ($self)
 	my $v = $self->validation;
 
 	my $page = $v->optional("page")->num(1, undef)->param // 1;
-	return $self->render(
-		status => 400
-	) if $v->has_error;
+	return $self->render(status => 400) if $v->has_error;
 
 	my $media_id = $self->stash("media_id");
 
diff --git a/lib/Pooru/Site/Controller/Random.pm b/lib/Pooru/Site/Controller/Random.pm
index e58d0fc..c1b15a6 100644
--- a/lib/Pooru/Site/Controller/Random.pm
+++ b/lib/Pooru/Site/Controller/Random.pm
@@ -30,7 +30,7 @@ sub tag ($self)
 
 		my @tags = $tx->res->json->{tags}->@*;
 		my $url = $self->url_for("list_media")
-		    ->query(tags => $tags[int(rand(@tags))]->{display});
+		    ->query(tags => $tags[int(rand(@tags))]->{display} . " ");
 		return $self->redirect_to($url);
 	})->wait;
 }
diff --git a/lib/Pooru/Site/Controller/Tags.pm b/lib/Pooru/Site/Controller/Tags.pm
index 5ac4aca..97d1cb0 100644
--- a/lib/Pooru/Site/Controller/Tags.pm
+++ b/lib/Pooru/Site/Controller/Tags.pm
@@ -6,9 +6,7 @@ sub list ($self)
 	my $v = $self->validation;
 
 	my $page = $v->optional("page")->num(1, undef)->param // 1;
-	return $self->render(
-		status => 400
-	) if $v->has_error;
+	return $self->render(status => 400) if $v->has_error;
 
 	$self->render_later;
 
@@ -40,9 +38,7 @@ sub search ($self)
 	my $v = $self->validation;
 
 	my $q = $v->required("q")->param;
-	return $self->render(
-		status => 400
-	) if $v->has_error;
+	return $self->render(status => 400) if $v->has_error;
 
 	return $self->render(json => []) if $q eq "";
 
diff --git a/templates/media.html.ep b/templates/media.html.ep
index cb5cc76..f6036b7 100644
--- a/templates/media.html.ep
+++ b/templates/media.html.ep
@@ -4,7 +4,7 @@
 
 <div class="media-metadata">
 % if ($tags->@* == 0) {
-    <p>Non tags yet. &gt;_&lt;</p>
+    <p>Non tags yet. <%= ">_<'" %></p>
 % } else {
   <dl>
 %   for my $entry (tags_by_kind $tags) {