diff --git a/server/public/assets/js/channel.js b/server/public/assets/js/channel.js
index faf546cc..15ba01f6 100644
--- a/server/public/assets/js/channel.js
+++ b/server/public/assets/js/channel.js
@@ -168,11 +168,11 @@ var Channel = {
             change_offline(true, offline);
         }
         if(!Helper.mobilecheck() && (document.querySelectorAll("#alreadychannel").length === 0 || !Hostcontroller.old_id || document.getElementById("code-text").innerText.toUpperCase() == "ABBADUR")) setup_host_initialization();
-
+        setup_suggested_listener();
         if(document.querySelectorAll("#alreadychannel").length === 0 || Helper.mobilecheck()){
             setup_now_playing_listener();
             get_list_listener();
-            setup_suggested_listener();
+
             if(!client) {
                 setup_viewers_listener();
             }
diff --git a/server/public/assets/js/list.js b/server/public/assets/js/list.js
index 7f68f1ba..c13260ed 100755
--- a/server/public/assets/js/list.js
+++ b/server/public/assets/js/list.js
@@ -1128,18 +1128,8 @@ var List = {
             song.querySelector(".vote-container").setAttribute("class", "clickable add-suggested");
             song.querySelector(".add-suggested").setAttribute("title", video_title);
             //Helper.addClass(song.querySelector(".delete_button"), del_attr);
-
             song.querySelector(".list-votes").innerText = _song_info.extra;
-            if(_song_info.extra == "Added") {
-                var date = new Date(video_votes * 1000);
-                song.querySelector(".vote-text").innerText = Helper.pad(date.getHours()) + ":"
-                                                            + Helper.pad(date.getMinutes()) + " - "
-                                                            + Helper.pad(date.getDate()) + "."
-                                                            + Helper.pad(date.getMonth()) + "."
-                                                            + Helper.pad((date.getYear()-100));
-            } else if(_song_info.extra == "Views") {
-                song.querySelector(".vote-text").innerText = video_votes.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
-            }
+            song.querySelector(".vote-text").innerText = video_votes;
             song.querySelector(attr).setAttribute("data-video-title", video_title);
             song.querySelector(attr).setAttribute("data-video-length", _song_info.length);
             song.querySelector(attr).setAttribute("data-added-by", added_by);
diff --git a/server/public/assets/js/suggestions.js b/server/public/assets/js/suggestions.js
index 111ab49e..447c3cee 100755
--- a/server/public/assets/js/suggestions.js
+++ b/server/public/assets/js/suggestions.js
@@ -30,7 +30,13 @@ var Suggestions = {
         var duration 	= Helper.secondsToOther(params.duration);
         var video_id 	= params.id;
         var video_title = params.title;
-        var toSend = {id: video_id, title: video_title, length: params.duration, duration: duration, votes: params.added, extra: "Added"};
+        var date = new Date(params.added * 1000);
+        var addedTime = Helper.pad(date.getHours()) + ":"
+                        + Helper.pad(date.getMinutes()) + " - "
+                        + Helper.pad(date.getDate()) + "."
+                        + Helper.pad(date.getMonth()) + "."
+                        + Helper.pad((date.getYear()-100));
+        var toSend = {id: video_id, title: video_title, length: params.duration, duration: duration, votes: addedTime, extra: "Added"};
         if(params.source) toSend.source = params.source;
         if(params.thumbnail) toSend.thumbnail = params.thumbnail;
         var song 		= List.generateSong(toSend, false, false, false, true);
@@ -84,9 +90,10 @@ var Suggestions = {
                             duration 		= Helper.secondsToOther(Search.durationToSeconds(duration));
                             var video_id 	= song.id;
                             var video_title = song.snippet.title;
+                            var viewCount = song.statistics.viewCount.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
 
                             try {
-                                document.getElementById("suggest-song-html").insertAdjacentHTML("beforeend", List.generateSong({id: video_id, title: video_title, length: length, duration: duration, votes: song.statistics.viewCount, extra: "Views"}, false, false, false));
+                                document.getElementById("suggest-song-html").insertAdjacentHTML("beforeend", List.generateSong({id: video_id, title: video_title, length: length, duration: duration, votes: viewCount, extra: "Views"}, false, false, false));
                             } catch(e) {}
                         }
                     }