diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index 2525c32bc4..014b42b390 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -762,7 +762,7 @@ a.itemTag:hover {
     }
 
     .detailPageContent {
-        max-width: 850px;
+        max-width: 900px;
     }
 
     .primaryDetailPageContent {
diff --git a/dashboard-ui/metadata.html b/dashboard-ui/metadata.html
index 4f576d51f3..7e4ebd6a89 100644
--- a/dashboard-ui/metadata.html
+++ b/dashboard-ui/metadata.html
@@ -27,8 +27,8 @@
                         </li>
                         <li>
                             <input type="checkbox" id="chkSaveLocal" name="chkSaveLocal" data-mini="true" />
-                            <label for="chkSaveLocal">Save metadata and images within media folders </label>
-                            <div class="fieldDescription">Save downloaded metadata and images into media folders where they can be stored permanently and easily edited.</div>
+                            <label for="chkSaveLocal">Save images within media folders </label>
+                            <div class="fieldDescription">Save downloaded images into media folders where they can be stored permanently and easily edited. Metadata savers are configured separately on a per-type basis.</div>
                         </li>
                         <li>
                             <label for="selectImageSavingConvention">Image saving convention: </label>
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index 5f15d95c12..9aab74a593 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -1602,6 +1602,10 @@
 
         $('.libraryTree', page).on('itemclicked', function (event, data) {
 
+            if (data.itemType == "livetvservice") {
+                return;
+            }
+            
             if (data.id != currentItem.Id) {
 
                 MetadataEditor.currentItemId = data.id;
diff --git a/dashboard-ui/scripts/wizardsettings.js b/dashboard-ui/scripts/wizardsettings.js
index e7e19504a0..67fec1558e 100644
--- a/dashboard-ui/scripts/wizardsettings.js
+++ b/dashboard-ui/scripts/wizardsettings.js
@@ -4,19 +4,27 @@
 
         Dashboard.showLoadingMsg();
 
-        // After saving chapter task, now save server config
-        ApiClient.getServerConfiguration().done(function (config) {
+        $.ajax({
+            type: "POST",
+            url: ApiClient.getUrl("System/Configuration/SaveLocalMetadata", { Enabled: $('#chkSaveLocalMetadata', page).checked() })
+            
+        }).done(function() {
+            
 
-            config.SaveLocalMeta = $('#chkSaveLocalMetadata', page).checked();
-            config.PreferredMetadataLanguage = $('#selectLanguage', page).val();
-            config.MetadataCountryCode = $('#selectCountry', page).val();
+            // After saving chapter task, now save server config
+            ApiClient.getServerConfiguration().done(function (config) {
 
-            ApiClient.updateServerConfiguration(config).done(function (result) {
+                config.PreferredMetadataLanguage = $('#selectLanguage', page).val();
+                config.MetadataCountryCode = $('#selectCountry', page).val();
 
-                navigateToNextPage();
+                ApiClient.updateServerConfiguration(config).done(function (result) {
 
+                    navigateToNextPage();
+
+                });
             });
         });
+        
 
     }