diff --git a/server/handlers/list.js b/server/handlers/list.js
index bc9944f9..fe0c9774 100644
--- a/server/handlers/list.js
+++ b/server/handlers/list.js
@@ -184,14 +184,14 @@ function skip(list, guid, coll, offline, socket, callback) {
                 list.userpass = crypto.createHash('sha256').update(Functions.decrypt_string(list.userpass)).digest("base64");
             }
 
-            db.collection(coll + "_settings").find(function(err, docs){
+            db.collection(coll + "_settings").find(function(_err, docs){
                 if(docs.length > 0 && (docs[0].userpass == undefined || docs[0].userpass == "" || (list.hasOwnProperty('userpass') && docs[0].userpass == list.userpass))) {
                     Functions.check_inlist(coll, guid, socket, offline, undefined, "place 12");
 
                     var video_id;
                     adminpass = "";
                     video_id  = list.id;
-                    err       = list.error;
+                    var err       = list.error;
                     Search.check_if_error_or_blocked(video_id, coll, err == "5" || err == "100" || err == "101" || err == "150" || err == 5 || err == 100 || err == 101 || err == 150, function(trueError) {
                         var error = false;
                         if (!trueError) {
@@ -210,11 +210,11 @@ function skip(list, guid, coll, offline, socket, callback) {
                             if(!docs[0].skip || (docs[0].adminpass == hash && docs[0].adminpass !== "") || error)
                             {
                                 db.collection("frontpage_lists").find({"_id": coll}, function(err, frontpage_viewers){
-                                    if(
-                                        (strictSkip && (error || (docs[0].adminpass == hash && docs[0].adminpass !== "") || (docs[0].skips.length+1 >= strictSkipNumber))) ||
+                                    if(error ||
+                                        ((strictSkip && ((docs[0].adminpass == hash && docs[0].adminpass !== "") || (docs[0].skips.length+1 >= strictSkipNumber))) ||
                                         (!strictSkip && ((frontpage_viewers[0].viewers/2 <= docs[0].skips.length+1 && !Functions.contains(docs[0].skips, guid) && frontpage_viewers[0].viewers != 2) ||
                                             (frontpage_viewers[0].viewers == 2 && docs[0].skips.length+1 == 2 && !Functions.contains(docs[0].skips, guid)) ||
-                                            (docs[0].adminpass == hash && docs[0].adminpass !== "" && docs[0].skip))))
+                                            (docs[0].adminpass == hash && docs[0].adminpass !== "" && docs[0].skip)))))
                                     {
                                         Functions.checkTimeout("skip", 1, coll, coll, error, true, socket, function() {
                                             change_song(coll, error, video_id, docs);
@@ -403,13 +403,13 @@ function change_song_post(coll, next_song, conf, callback, socket, removed) {
                 }, function(err, returnDocs){
                     //db.collection(coll + "_settings").find({id: "config"}, function(err, conf){
                         if(!callback) {
-                            io.to(coll).emit("channel", {type: "song_change", time: Functions.get_time(), remove: conf[0].removeplay || removed});
+                            io.to(coll).emit("channel", {type: "song_change", time: Functions.get_time(), remove: conf[0].removeplay || removed, id: id});
                             send_play(coll);
                         } else {
                             if(socket == undefined) {
-                                io.to(coll).emit("channel", {type: "song_change", time: Functions.get_time(), remove: conf[0].removeplay || removed});
+                                io.to(coll).emit("channel", {type: "song_change", time: Functions.get_time(), remove: conf[0].removeplay || removed, id: id});
                             } else {
-                                socket.to(coll).emit("channel", {type: "song_change", time: Functions.get_time(), remove: conf[0].removeplay || removed});
+                                socket.to(coll).emit("channel", {type: "song_change", time: Functions.get_time(), remove: conf[0].removeplay || removed, id: id});
                             }
                             send_play(coll, socket, true);
                             callback();
diff --git a/server/handlers/search.js b/server/handlers/search.js
index e6a9712d..cf057533 100644
--- a/server/handlers/search.js
+++ b/server/handlers/search.js
@@ -37,8 +37,8 @@ function check_if_error_or_blocked(id, channel, errored, callback) {
                     } else if(!resp.items[0].status.embeddable) {
                         callback(true);
                         return;
-                    } else if(resp.items[0].contentDetails.hasOwnProperty("licensedContent") && 
-                              !resp.items[0].contentDetails.licensedContent) {
+                    } else if(resp.items[0].contentDetails.hasOwnProperty("licensedContent") &&
+                              resp.items[0].contentDetails.licensedContent) {
                         callback(true);
                         return;
                     } else if(resp.items[0].contentDetails.hasOwnProperty("regionRestriction") &&
diff --git a/server/public/assets/js/list.js b/server/public/assets/js/list.js
index ac8b6083..07a8ca1d 100755
--- a/server/public/assets/js/list.js
+++ b/server/public/assets/js/list.js
@@ -58,7 +58,7 @@ var List = {
                 break;
             case "song_change":
                 if((offline && msg.offline_change) || !offline) {
-                    if(window.location.pathname != "/") List.song_change(msg.time, msg.remove);
+                    if(window.location.pathname != "/") List.song_change(msg.time, msg.remove, msg.id);
                     if(full_playlist.length > 0) {
                         Player.sendNext({title: full_playlist[0].title, videoId: full_playlist[0].id, source: full_playlist[0].source, thumbnail: full_playlist[0].thumbnail});
                     }
@@ -584,14 +584,16 @@ var List = {
         List.insertAtIndex(full_playlist[0], false, true);
     },
 
-    song_change: function(time, remove) {
+    song_change: function(time, remove, id) {
         try{
             var length = full_playlist.length - 1;
-
             if(full_playlist.length <= 1) {
                 List.empty = true;
                 Helper.setHtml("#wrapper", "<span id='empty-channel-message'>The playlist is empty.</span>");
             }
+            if(id != full_playlist[0].id) {
+                return;
+            }
             var newLast = full_playlist[0];
             full_playlist[0].now_playing        = true;
             full_playlist[0].votes              = 0;