diff --git a/js/app.js b/js/app.js
index 53e2b11..c89e7e1 100755
--- a/js/app.js
+++ b/js/app.js
@@ -10,7 +10,7 @@ var passwordenc;
 var server;
 var smwidth;
 var volume = 50;
-var currentVersion = '2.2.2';
+var currentVersion = '2.2.3';
 
 function getCookie(value) {
     if ($.cookie(value)) {
diff --git a/js/ui-ready.js b/js/ui-ready.js
index 3ba82b6..ba9cc05 100755
--- a/js/ui-ready.js
+++ b/js/ui-ready.js
@@ -57,7 +57,7 @@
     // Version check
     if (getCookie('CurrentVersion')) {
         if (checkVersionNewer(parseVersionString(getCookie('CurrentVersion')), parseVersionString(currentVersion))) {
-            updateMessage('MiniSub updated to ' + currentVersion);
+            updateMessage('MiniSub updated to v' + currentVersion);
             setCookie('CurrentVersion', currentVersion);
         }
     } else {
@@ -651,14 +651,14 @@
         getRandomSongList('', '#TrackContainer tbody', genre, folder);
     });
     $('#AutoPlaylistContainer li.item a.play, #FolderContainer li.item a.play').live('click', function () {
-        var genre = $(this).data('genre');
-        var folder = $(this).data('folder');
+        var genre = $(this).data('genre') !== undefined ? $(this).data('genre') : '';
+        var folder = $(this).data('folder') !== undefined ? $(this).data('folder') : '';
         getRandomSongList('autoplay', '#CurrentPlaylistContainer tbody', genre, folder);
         return false;
     });
     $('#AutoPlaylistContainer li.item a.add, #FolderContainer li.item a.add').live('click', function () {
-        var genre = $(this).data('genre');
-        var folder = $(this).data('folder');
+        var genre = $(this).data('genre') !== undefined ? $(this).data('genre') : '';
+        var folder = $(this).data('folder') !== undefined ? $(this).data('folder') : '';
         getRandomSongList('', '#CurrentPlaylistContainer tbody', genre, folder);
         return false;
     });
diff --git a/manifest.json b/manifest.json
index 4a4d5f0..fd84abb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
 	"manifest_version": 2,
 	"name": "MiniSub",
 	"description": "MiniSub - HTML5 Mini Player for Subsonic",
-	"version": "2.2.2",
+	"version": "2.2.3",
 	"app": {
 		"launch": {
 			"local_path": "index.html"