diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html
index 971a5f29f6..7f8aa0b0c8 100644
--- a/dashboard-ui/dashboard.html
+++ b/dashboard-ui/dashboard.html
@@ -52,7 +52,6 @@
                                         <a href="http://mediabrowser.tv/download" target="_blank">${PleaseUpdateManually}</a>
                                     </div>
                                 </div>
-                                <div id="updateFail" style="color: #cc0000; display: none;">${ErrorConnectingToMediaBrowserRepository}</div>
                                 <p id="ports"></p>
                                 <div id="pPluginUpdates"></div>
 
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index 709b3c49b9..a38f6f969e 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -809,8 +809,6 @@
 
     renderHasPendingRestart: function (page, hasPendingRestart) {
 
-        $('#updateFail', page).hide();
-
         if (!hasPendingRestart) {
 
             // Only check once every 30 mins
@@ -835,10 +833,6 @@
                     $('#newVersionNumber', page).html(Globalize.translate('VersionXIsAvailableForDownload').replace('{0}', version.versionStr));
                 }
 
-            }).fail(function () {
-
-                $('#updateFail', page).show();
-
             });
 
         } else {
@@ -908,10 +902,6 @@
 
             elem.html(html).trigger('create');
 
-        }).fail(function () {
-
-            $('#updateFail', page).show();
-
         });
     },
 
diff --git a/dashboard-ui/scripts/playlistedit.js b/dashboard-ui/scripts/playlistedit.js
index 0173b694e0..2b1adffd50 100644
--- a/dashboard-ui/scripts/playlistedit.js
+++ b/dashboard-ui/scripts/playlistedit.js
@@ -18,6 +18,24 @@
         return 'playlists' + (query.ParentId || '');
     }
 
+    function getItemsFunction(itemsQuery) {
+
+        itemsQuery = $.extend({}, itemsQuery);
+
+        return function (index, limit, fields) {
+
+            itemsQuery.StartIndex = index;
+            itemsQuery.Limit = limit;
+            itemsQuery.Fields = fields;
+
+            return ApiClient.getItems(Dashboard.getCurrentUserId(), itemsQuery);
+
+        };
+
+    }
+
+    var _childrenItemsFunction = null;
+
     function reloadItems(page) {
 
         Dashboard.showLoadingMsg();
@@ -34,6 +52,8 @@
             var user = response2[0];
             var item = response3[0];
 
+            _childrenItemsFunction = getItemsFunction(query);
+
             currentItem = item;
 
             if (MediaController.canPlay(item)) {
@@ -184,21 +204,11 @@
 
         }).on('playallfromhere', function (e, index) {
 
-            LibraryBrowser.playAllFromHere({
-                
-                Recursive: true,
-                ParentId: query.ParentId
-
-            }, index);
+            LibraryBrowser.playAllFromHere(_childrenItemsFunction, index);
 
         }).on('queueallfromhere', function (e, index) {
 
-            LibraryBrowser.queueAllFromHere({
-
-                Recursive: true,
-                ParentId: query.ParentId
-
-            }, index);
+            LibraryBrowser.queueAllFromHere(_childrenItemsFunction, index);
 
         });