4 files changed, 31 insertions, 9 deletions
diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index 0900cc1ef..32d3dd5c8 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -14,11 +14,11 @@ namespace MediaBrowser.Controller.Entities.Audio
     /// <summary>
     /// Class Audio
     /// </summary>
-    public class Audio : BaseItem, 
-        IHasAlbumArtist, 
-        IHasArtist, 
-        IHasMusicGenres, 
-        IHasLookupInfo<SongInfo>, 
+    public class Audio : BaseItem,
+        IHasAlbumArtist,
+        IHasArtist,
+        IHasMusicGenres,
+        IHasLookupInfo<SongInfo>,
         IHasTags,
         IHasMediaSources
     {
@@ -64,7 +64,15 @@ namespace MediaBrowser.Controller.Entities.Audio
         {
             get
             {
-                return Parents.OfType<MusicAlbum>().FirstOrDefault() ?? new MusicAlbum { Name = "<Unknown>" };
+                return LatestItemsIndexContainer ?? new MusicAlbum { Name = "Unknown Album" };
+            }
+        }
+
+        public override Folder LatestItemsIndexContainer
+        {
+            get
+            {
+                return Parents.OfType<MusicAlbum>().FirstOrDefault();
             }
         }
 
@@ -204,7 +212,7 @@ namespace MediaBrowser.Controller.Entities.Audio
         private static MediaSourceInfo GetVersionInfo(Audio i, bool enablePathSubstituion)
         {
             var locationType = i.LocationType;
-            
+
             var info = new MediaSourceInfo
             {
                 Id = i.Id.ToString("N"),
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 042834731..d89df5f12 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -796,6 +796,12 @@ namespace MediaBrowser.Controller.Entities
             get { return null; }
         }
 
+        [IgnoreDataMember]
+        public virtual Folder LatestItemsIndexContainer
+        {
+            get { return null; }
+        }
+
         /// <summary>
         /// Gets the user data key.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index 847183fd0..8a554c1d5 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -95,6 +95,14 @@ namespace MediaBrowser.Controller.Entities.TV
             }
         }
 
+        public override Folder LatestItemsIndexContainer
+        {
+            get
+            {
+                return Series;
+            }
+        }
+
         /// <summary>
         /// Gets the user data key.
         /// </summary>
diff --git a/MediaBrowser.Controller/Providers/NameParser.cs b/MediaBrowser.Controller/Providers/NameParser.cs
index 726f0e60e..cdd0974ea 100644
--- a/MediaBrowser.Controller/Providers/NameParser.cs
+++ b/MediaBrowser.Controller/Providers/NameParser.cs
@@ -5,13 +5,13 @@ namespace MediaBrowser.Controller.Providers
 {
     public static class NameParser
     {
-        static readonly Regex[] NameMatches = new[] {
+        static readonly Regex[] NameMatches =
+        {
             new Regex(@"(?<name>.*)\((?<year>\d{4})\)"), // matches "My Movie (2001)" and gives us the name and the year
             new Regex(@"(?<name>.*)(\.(?<year>\d{4})(\.|$)).*$"), 
             new Regex(@"(?<name>.*)") // last resort matches the whole string as the name
         };
 
-
         /// <summary>
         /// Parses the name.
         /// </summary>