diff --git a/src/invidious.cr b/src/invidious.cr
index 973d0482..9eecf106 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -151,9 +151,11 @@ get "/watch" do |env|
     fmt_stream << HTTP::Params.parse(string)
   end
 
-  if fmt_stream[0]["s"]?
-    fmt_stream.each do |fmt|
-      fmt["url"] = "#{fmt["url"]}&signature=#{decrypt_signature(fmt["s"])}"
+  if fmt_stream[0]?
+    if fmt_stream[0]["s"]?
+      fmt_stream.each do |fmt|
+        fmt["url"] = "#{fmt["url"]}&signature=#{decrypt_signature(fmt["s"])}"
+      end
     end
   end
 
@@ -167,9 +169,11 @@ get "/watch" do |env|
     end
   end
 
-  if adaptive_fmts[0]["s"]?
-    adaptive_fmts.each do |fmt|
-      fmt["url"] = "#{fmt["url"]}&signature=#{decrypt_signature(fmt["s"])}"
+  if adaptive_fmts[0]?
+    if adaptive_fmts[0]["s"]?
+      adaptive_fmts.each do |fmt|
+        fmt["url"] = "#{fmt["url"]}&signature=#{decrypt_signature(fmt["s"])}"
+      end
     end
   end
 
diff --git a/src/views/search.ecr b/src/views/search.ecr
index da585366..105e25af 100644
--- a/src/views/search.ecr
+++ b/src/views/search.ecr
@@ -7,7 +7,7 @@
 <% slice.each do |video| %>
     <div class="pure-u-1 pure-u-md-1-4">
         <div style="margin:1em;">
-            <a style="width:100%;" class="link" href="/watch?v=<%= video["link"] %>">
+            <a style="width:100%;" class="link" href="<%= video["link"] %>">
                 <img style="width:100%;" src="<%= video["thumbnail"] %>"/>
                 <%= video["title"] %>
             </a>