diff --git a/lib/services/youtube.js b/lib/services/youtube.js
index a73a614..35dd445 100644
--- a/lib/services/youtube.js
+++ b/lib/services/youtube.js
@@ -29,7 +29,7 @@ module.exports.search = function(data) {
     query = data.artist.name + " " + data.name;
     album = data.name;
   } else if (type == "track") {
-    query = data.artist.name + " " + data.album.name + " " + data.name;
+    query = data.artist.name + data.name;
     album = data.album.name
   }
 
diff --git a/views/track.ejs b/views/track.ejs
index 46e51dd..9683239 100644
--- a/views/track.ejs
+++ b/views/track.ejs
@@ -17,10 +17,15 @@
     </div>
     <div class="row">
     <% for (var i=0;i < items.length;i++) { var track = items[i]; %>
-      <div class="col-md-3 col-xs-6">
+      <% if (track.type != "video") { %><div class="col-md-3 col-xs-6"><% } else { %><div class="col-md-6 col-xs-12"><% } %>
         <div class="service <%= i==0 ? "source-service" : "" %>">
           <div class="matching-from"><%= i==0 ? "Found matches using this link" : "" %></div>
-          <% if (track.streamUrl) { %>
+          <% if (track.type == "video") { %>
+            <div class="js-video widescreen">
+              <iframe width="100%" src="//www.youtube.com/embed/<%= track.id %>" frameborder="0" allowfullscreen></iframe>
+            </div>
+            <a href="https://www.youtube.com/results?search_query=<%= items[0].name %> <%= items[0].artist.name %>">More Youtube matches</a>
+            <% } else if (track.streamUrl) { %>
           <a href="<%= track.streamUrl %>"><img src="<%= track.artwork %>" class="img-rounded album-artwork" width="100%"></a>
           <div class="service-link">
             <a href="<%= track.streamUrl %>"><img src="/images/<%= track.service %>.png" class="img-rounded"></a>