diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index 57fc711c23..ff67db1b69 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -67,6 +67,8 @@ namespace MediaBrowser.Model.Dto
         public bool? CanDelete { get; set; }
         public bool? CanDownload { get; set; }
 
+        public bool? HasSubtitles { get; set; }
+        
         public string PreferredMetadataLanguage { get; set; }
         public string PreferredMetadataCountryCode { get; set; }
 
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index 97867d6a2b..20e1eb5434 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -1310,6 +1310,11 @@ namespace MediaBrowser.Server.Implementations.Dto
                 dto.Video3DFormat = video.Video3DFormat;
                 dto.IsoType = video.IsoType;
 
+                if (video.HasSubtitles)
+                {
+                    dto.HasSubtitles = video.HasSubtitles;
+                }
+
                 if (video.AdditionalParts.Count != 0)
                 {
                     dto.PartCount = video.AdditionalParts.Count + 1;
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index cdfe9ebef4..f4fd04f371 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -882,7 +882,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
 
         private string GetChannelEpgCachePath(string channelId)
         {
-            return Path.Combine(DataPath, "epg", channelId + ".json");
+            return Path.Combine(_config.CommonApplicationPaths.CachePath, "embytvepg", channelId + ".json");
         }
 
         private readonly object _epgLock = new object();
diff --git a/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs b/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
index 65b920c90a..04f55d16b7 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
@@ -94,6 +94,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
 
             if (station == null)
             {
+                _logger.Info("No Schedules Direct Station found for channel {0} with name {1}", channelNumber, channelName);
                 return programsInfo;
             }
 
@@ -249,7 +250,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
 
                 foreach (ChannelInfo channel in channels)
                 {
-                    var station = GetStation(channel.Number, channel.Number);
+                    var station = GetStation(channel.Number, channel.Name);
 
                     if (station != null)
                     {