6 files changed, 17 insertions, 18 deletions

diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index 26e46b63a..9761aad4f 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -28,8 +28,10 @@ namespace MediaBrowser.Controller.Entities.Audio
         /// Gets or sets the artist.
         /// </summary>
         /// <value>The artist.</value>
+        [IgnoreDataMember]
         public List<string> Artists { get; set; }
 
+        [IgnoreDataMember]
         public List<string> AlbumArtists { get; set; }
 
         [IgnoreDataMember]
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 14580a849..cb345439a 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -51,7 +51,6 @@ namespace MediaBrowser.Controller.Entities
             ProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
             LockedFields = new List<MetadataFields>();
             ImageInfos = new List<ItemImageInfo>();
-            InheritedTags = new List<string>();
             ProductionLocations = new List<string>();
         }
 
@@ -73,7 +72,9 @@ namespace MediaBrowser.Controller.Entities
         public static string ThemeSongFilename = "theme";
         public static string ThemeVideosFolderName = "backdrops";
 
+        [IgnoreDataMember]
         public List<Guid> ThemeSongIds { get; set; }
+        [IgnoreDataMember]
         public List<Guid> ThemeVideoIds { get; set; }
 
         [IgnoreDataMember]
@@ -87,6 +88,7 @@ namespace MediaBrowser.Controller.Entities
         [IgnoreDataMember]
         public string Tagline { get; set; }
 
+        [IgnoreDataMember]
         public List<ItemImageInfo> ImageInfos { get; set; }
 
         [IgnoreDataMember]
@@ -197,7 +199,9 @@ namespace MediaBrowser.Controller.Entities
             get { return PremiereDate.HasValue && PremiereDate.Value.ToLocalTime().Date >= DateTime.Now.Date; }
         }
 
+        [IgnoreDataMember]
         public int? TotalBitrate { get; set; }
+        [IgnoreDataMember]
         public ExtraType? ExtraType { get; set; }
 
         [IgnoreDataMember]
@@ -803,13 +807,6 @@ namespace MediaBrowser.Controller.Entities
         public DateTime? EndDate { get; set; }
 
         /// <summary>
-        /// Gets or sets the display type of the media.
-        /// </summary>
-        /// <value>The display type of the media.</value>
-        [IgnoreDataMember]
-        public string DisplayMediaType { get; set; }
-
-        /// <summary>
         /// Gets or sets the official rating.
         /// </summary>
         /// <value>The official rating.</value>
@@ -819,9 +816,6 @@ namespace MediaBrowser.Controller.Entities
         [IgnoreDataMember]
         public int InheritedParentalRatingValue { get; set; }
 
-        [IgnoreDataMember]
-        public List<string> InheritedTags { get; set; }
-
         /// <summary>
         /// Gets or sets the critic rating.
         /// </summary>
@@ -864,6 +858,7 @@ namespace MediaBrowser.Controller.Entities
         [IgnoreDataMember]
         public List<string> Tags { get; set; }
 
+        [IgnoreDataMember]
         public List<string> ProductionLocations { get; set; }
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Entities/IHasImages.cs b/MediaBrowser.Controller/Entities/IHasImages.cs
index db69df31a..6d56b1525 100644
--- a/MediaBrowser.Controller/Entities/IHasImages.cs
+++ b/MediaBrowser.Controller/Entities/IHasImages.cs
@@ -98,12 +98,6 @@ namespace MediaBrowser.Controller.Entities
         Task SwapImages(ImageType type, int index1, int index2);
 
         /// <summary>
-        /// Gets the display type of the media.
-        /// </summary>
-        /// <value>The display type of the media.</value>
-        string DisplayMediaType { get; set; }
-
-        /// <summary>
         /// Gets or sets the primary image path.
         /// </summary>
         /// <value>The primary image path.</value>
@@ -208,6 +202,8 @@ namespace MediaBrowser.Controller.Entities
         double? GetDefaultPrimaryImageAspectRatio();
 
         int? ProductionYear { get; set; }
+
+        List<string> Tags { get; set; }
     }
 
     public static class HasImagesExtensions
diff --git a/MediaBrowser.Controller/Entities/IHasMetadata.cs b/MediaBrowser.Controller/Entities/IHasMetadata.cs
index 17143c4d4..1d2e23a6c 100644
--- a/MediaBrowser.Controller/Entities/IHasMetadata.cs
+++ b/MediaBrowser.Controller/Entities/IHasMetadata.cs
@@ -64,7 +64,6 @@ namespace MediaBrowser.Controller.Entities
         int? GetInheritedParentalRatingValue();
         int InheritedParentalRatingValue { get; set; }
         List<string> GetInheritedTags();
-        List<string> InheritedTags { get; set; }
         long? RunTimeTicks { get; set; }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/MusicVideo.cs b/MediaBrowser.Controller/Entities/MusicVideo.cs
index 4e2bda964..2028c1c3b 100644
--- a/MediaBrowser.Controller/Entities/MusicVideo.cs
+++ b/MediaBrowser.Controller/Entities/MusicVideo.cs
@@ -8,6 +8,7 @@ namespace MediaBrowser.Controller.Entities
 {
     public class MusicVideo : Video, IHasArtist, IHasMusicGenres, IHasLookupInfo<MusicVideoInfo>
     {
+        [IgnoreDataMember]
         public List<string> Artists { get; set; }
 
         public MusicVideo()
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index c027a3541..7734ab8b0 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -52,6 +52,12 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
+        /// <summary>
+        /// Gets or sets the display type of the media.
+        /// </summary>
+        /// <value>The display type of the media.</value>
+        public string DisplayMediaType { get; set; }
+
         [IgnoreDataMember]
         public override bool SupportsPositionTicksResume
         {