diff --git a/src/scripts/moviecollections.js b/src/scripts/moviecollections.js
index 01fdc5d5af..ee59475e22 100644
--- a/src/scripts/moviecollections.js
+++ b/src/scripts/moviecollections.js
@@ -4,20 +4,25 @@ define(["loading", "events", "libraryBrowser", "imageLoader", "listView", "cardB
         function getPageData(context) {
             var key = getSavedQueryKey(context),
                 pageData = data[key];
-            return pageData || (pageData = data[key] = {
-                query: {
-                    SortBy: "SortName",
-                    SortOrder: "Ascending",
-                    IncludeItemTypes: "BoxSet",
-                    Recursive: !0,
-                    Fields: "PrimaryImageAspectRatio,SortName",
-                    ImageTypeLimit: 1,
-                    EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
-                    StartIndex: 0,
-                    Limit: pageSize
-                },
-                view: libraryBrowser.getSavedView(key) || "Poster"
-            }, pageData.query.ParentId = params.topParentId, libraryBrowser.loadSavedQueryValues(key, pageData.query)), pageData
+            if (!pageData) {
+                pageData = data[key] = {
+                    query: {
+                        SortBy: "SortName",
+                        SortOrder: "Ascending",
+                        IncludeItemTypes: "BoxSet",
+                        Recursive: true,
+                        Fields: "PrimaryImageAspectRatio,SortName",
+                        ImageTypeLimit: 1,
+                        EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
+                        StartIndex: 0,
+                        Limit: pageSize
+                    },
+                    view: libraryBrowser.getSavedView(key) || "Poster"
+                };
+                pageData.query.ParentId = params.topParentId;
+                libraryBrowser.loadSavedQueryValues(key, pageData.query);
+            }
+            return pageData;
         }
 
         function getQuery(context) {
diff --git a/src/scripts/movies.js b/src/scripts/movies.js
index 689832b299..a25e54b492 100644
--- a/src/scripts/movies.js
+++ b/src/scripts/movies.js
@@ -3,7 +3,14 @@ define(["loading", "layoutManager", "userSettings", "events", "libraryBrowser",
     "use strict";
     return function(view, params, tabContent, options) {
         function onViewStyleChange() {
-            "List" == self.getCurrentViewStyle() ? (itemsContainer.classList.add("vertical-list"), itemsContainer.classList.remove("vertical-wrap")) : (itemsContainer.classList.remove("vertical-list"), itemsContainer.classList.add("vertical-wrap")), itemsContainer.innerHTML = ""
+            if (self.getCurrentViewStyle() == "List") {
+                itemsContainer.classList.add("vertical-list");
+                itemsContainer.classList.remove("vertical-wrap");
+            } else {
+                itemsContainer.classList.remove("vertical-list");
+                itemsContainer.classList.add("vertical-wrap");
+            }
+            itemsContainer.innerHTML = "";
         }
 
         function updateFilterControls() {
@@ -101,15 +108,27 @@ define(["loading", "layoutManager", "userSettings", "events", "libraryBrowser",
         }
 
         function initPage(tabContent) {
-            itemsContainer.fetchData = fetchData, itemsContainer.getItemsHtml = getItemsHtml, itemsContainer.afterRefresh = afterRefresh;
+            itemsContainer.fetchData = fetchData;
+            itemsContainer.getItemsHtml = getItemsHtml;
+            itemsContainer.afterRefresh = afterRefresh;
             var alphaPickerElement = tabContent.querySelector(".alphaPicker");
-            alphaPickerElement && (alphaPickerElement.addEventListener("alphavaluechanged", function(e) {
-                var newValue = e.detail.value;
-                query.NameStartsWithOrGreater = newValue, query.StartIndex = 0, itemsContainer.refreshItems()
-            }), self.alphaPicker = new alphaPicker({
-                element: alphaPickerElement,
-                valueChangeEvent: "click"
-            }), (layoutManager.desktop || layoutManager.mobile) && (alphaPickerElement.classList.add("alphabetPicker-right"), itemsContainer.classList.remove("padded-left-withalphapicker"), itemsContainer.classList.add("padded-right-withalphapicker")));
+            if (alphaPickerElement) {
+                alphaPickerElement.addEventListener("alphavaluechanged", function(e) {
+                    var newValue = e.detail.value;
+                    query.NameStartsWithOrGreater = newValue;
+                    query.StartIndex = 0;
+                    itemsContainer.refreshItems();
+                });
+                self.alphaPicker = new alphaPicker({
+                    element: alphaPickerElement,
+                    valueChangeEvent: "click"
+                });
+                if (layoutManager.desktop || layoutManager.mobile) {
+                    alphaPickerElement.classList.add("alphabetPicker-right");
+                    itemsContainer.classList.remove("padded-left-withalphapicker");
+                    itemsContainer.classList.add("padded-right-withalphapicker");
+                }
+            }
             var btnFilter = tabContent.querySelector(".btnFilter");
             btnFilter && btnFilter.addEventListener("click", function() {
                 self.showFilterMenu()
@@ -157,7 +176,10 @@ define(["loading", "layoutManager", "userSettings", "events", "libraryBrowser",
                 libraryBrowser.showLayoutMenu(e.target, self.getCurrentViewStyle(), "Banner,List,Poster,PosterCard,Thumb,ThumbCard".split(","))
             }), btnSelectView.addEventListener("layoutchange", function(e) {
                 var viewStyle = e.detail.viewStyle;
-                userSettings.set(savedViewKey, viewStyle), query.StartIndex = 0, onViewStyleChange(), itemsContainer.refreshItems()
+                userSettings.set(savedViewKey, viewStyle);
+                query.StartIndex = 0;
+                onViewStyleChange();
+                itemsContainer.refreshItems();
             })
         }
         var self = this,
@@ -190,13 +212,19 @@ define(["loading", "layoutManager", "userSettings", "events", "libraryBrowser",
                     query.StartIndex = 0, itemsContainer.refreshItems()
                 }), filterDialog.show()
             })
-        }, self.getCurrentViewStyle = function() {
+        };
+        self.getCurrentViewStyle = function() {
             return userSettings.get(savedViewKey) || "Poster"
-        }, self.initTab = function() {
-            initPage(tabContent), onViewStyleChange()
-        }, self.renderTab = function() {
-            itemsContainer.refreshItems(), updateFilterControls()
-        }, self.destroy = function() {
+        };
+        self.initTab = function() {
+            initPage(tabContent);
+            onViewStyleChange();
+        };
+        self.renderTab = function() {
+            itemsContainer.refreshItems();
+            updateFilterControls();
+        };
+        self.destroy = function() {
             itemsContainer = null
         }
     }