diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
index 00b85a0a6d..cb2bf68774 100644
--- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
+++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
@@ -312,6 +312,17 @@ namespace MediaBrowser.Controller.Providers
                         break;
                     }
 
+                case "LockData":
+                    {
+                        var val = reader.ReadElementContentAsString();
+
+                        if (!string.IsNullOrWhiteSpace(val))
+                        {
+                            item.DontFetchMeta = string.Equals("true", val, StringComparison.OrdinalIgnoreCase);
+                        }
+                        break;
+                    }
+
                 case "Network":
                     {
                         foreach (var name in SplitNames(reader.ReadElementContentAsString()))
diff --git a/MediaBrowser.Providers/Savers/XmlSaverHelpers.cs b/MediaBrowser.Providers/Savers/XmlSaverHelpers.cs
index e6776af26d..5e9bc942df 100644
--- a/MediaBrowser.Providers/Savers/XmlSaverHelpers.cs
+++ b/MediaBrowser.Providers/Savers/XmlSaverHelpers.cs
@@ -69,7 +69,8 @@ namespace MediaBrowser.Providers.Savers
                     "Genres",
                     "Studios",
                     "Tags",
-                    "Added"
+                    "Added",
+                    "LockData"
                 });
 
                 var position = xml.ToString().LastIndexOf("</", StringComparison.OrdinalIgnoreCase);
@@ -156,6 +157,8 @@ namespace MediaBrowser.Providers.Savers
 
             builder.Append("<Added>" + SecurityElement.Escape(item.DateCreated.ToString(UsCulture)) + "</Added>");
 
+            builder.Append("<LockData>" + item.DontFetchMeta.ToString().ToLower() + "</LockData>");
+            
             if (!string.IsNullOrEmpty(item.DisplayMediaType))
             {
                 builder.Append("<Type>" + SecurityElement.Escape(item.DisplayMediaType) + "</Type>");
@@ -191,7 +194,7 @@ namespace MediaBrowser.Providers.Savers
                 builder.Append("<SortTitle>" + SecurityElement.Escape(item.ForcedSortName) + "</SortTitle>");
             }
 
-            if (item.PremiereDate.HasValue)
+            if (item.PremiereDate.HasValue && !(item is Episode))
             {
                 builder.Append("<PremiereDate>" + SecurityElement.Escape(item.PremiereDate.Value.ToString("yyyy-MM-dd")) + "</PremiereDate>");
             }
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index a2ef2fe4e6..f1dd24058d 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1178,7 +1178,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 return item;
             }
 
-            return null;
+            return RetrieveItem(id);
         }
 
         /// <summary>