Merge pull request #1899 from MediaBrowser/beta

Beta

70 files changed, 4825 insertions, 3248 deletions

diff --git a/MediaBrowser.Server.Implementations/Activity/ActivityRepository.cs b/MediaBrowser.Server.Implementations/Activity/ActivityRepository.cs
index b0e05a5bc..c992def39 100644
--- a/MediaBrowser.Server.Implementations/Activity/ActivityRepository.cs
+++ b/MediaBrowser.Server.Implementations/Activity/ActivityRepository.cs
@@ -15,54 +15,26 @@ namespace MediaBrowser.Server.Implementations.Activity
 {
     public class ActivityRepository : BaseSqliteRepository, IActivityRepository
     {
-        private IDbConnection _connection;
-        private readonly IServerApplicationPaths _appPaths;
         private readonly CultureInfo _usCulture = new CultureInfo("en-US");
 
-        private IDbCommand _saveActivityCommand;
-
-        public ActivityRepository(ILogManager logManager, IServerApplicationPaths appPaths)
-            : base(logManager)
+        public ActivityRepository(ILogManager logManager, IServerApplicationPaths appPaths, IDbConnector connector)
+            : base(logManager, connector)
         {
-            _appPaths = appPaths;
+            DbFilePath = Path.Combine(appPaths.DataPath, "activitylog.db");
         }
 
-        public async Task Initialize(IDbConnector dbConnector)
+        public async Task Initialize()
         {
-            var dbFile = Path.Combine(_appPaths.DataPath, "activitylog.db");
-
-            _connection = await dbConnector.Connect(dbFile).ConfigureAwait(false);
-
-            string[] queries = {
+            using (var connection = await CreateConnection().ConfigureAwait(false))
+            {
+                string[] queries = {
 
                                 "create table if not exists ActivityLogEntries (Id GUID PRIMARY KEY, Name TEXT, Overview TEXT, ShortOverview TEXT, Type TEXT, ItemId TEXT, UserId TEXT, DateCreated DATETIME, LogSeverity TEXT)",
-                                "create index if not exists idx_ActivityLogEntries on ActivityLogEntries(Id)",
-
-                                //pragmas
-                                "pragma temp_store = memory",
-
-                                "pragma shrink_memory"
+                                "create index if not exists idx_ActivityLogEntries on ActivityLogEntries(Id)"
                                };
 
-            _connection.RunQueries(queries, Logger);
-
-            PrepareStatements();
-        }
-
-        private void PrepareStatements()
-        {
-            _saveActivityCommand = _connection.CreateCommand();
-            _saveActivityCommand.CommandText = "replace into ActivityLogEntries (Id, Name, Overview, ShortOverview, Type, ItemId, UserId, DateCreated, LogSeverity) values (@Id, @Name, @Overview, @ShortOverview, @Type, @ItemId, @UserId, @DateCreated, @LogSeverity)";
-
-            _saveActivityCommand.Parameters.Add(_saveActivityCommand, "@Id");
-            _saveActivityCommand.Parameters.Add(_saveActivityCommand, "@Name");
-            _saveActivityCommand.Parameters.Add(_saveActivityCommand, "@Overview");
-            _saveActivityCommand.Parameters.Add(_saveActivityCommand, "@ShortOverview");
-            _saveActivityCommand.Parameters.Add(_saveActivityCommand, "@Type");
-            _saveActivityCommand.Parameters.Add(_saveActivityCommand, "@ItemId");
-            _saveActivityCommand.Parameters.Add(_saveActivityCommand, "@UserId");
-            _saveActivityCommand.Parameters.Add(_saveActivityCommand, "@DateCreated");
-            _saveActivityCommand.Parameters.Add(_saveActivityCommand, "@LogSeverity");
+                connection.RunQueries(queries, Logger);
+            }
         }
 
         private const string BaseActivitySelectText = "select Id, Name, Overview, ShortOverview, Type, ItemId, UserId, DateCreated, LogSeverity from ActivityLogEntries";
@@ -79,128 +51,145 @@ namespace MediaBrowser.Server.Implementations.Activity
                 throw new ArgumentNullException("entry");
             }
 
-            await WriteLock.WaitAsync().ConfigureAwait(false);
+            using (var connection = await CreateConnection().ConfigureAwait(false))
+            {
+                using (var saveActivityCommand = connection.CreateCommand())
+                {
+                    saveActivityCommand.CommandText = "replace into ActivityLogEntries (Id, Name, Overview, ShortOverview, Type, ItemId, UserId, DateCreated, LogSeverity) values (@Id, @Name, @Overview, @ShortOverview, @Type, @ItemId, @UserId, @DateCreated, @LogSeverity)";
 
-            IDbTransaction transaction = null;
+                    saveActivityCommand.Parameters.Add(saveActivityCommand, "@Id");
+                    saveActivityCommand.Parameters.Add(saveActivityCommand, "@Name");
+                    saveActivityCommand.Parameters.Add(saveActivityCommand, "@Overview");
+                    saveActivityCommand.Parameters.Add(saveActivityCommand, "@ShortOverview");
+                    saveActivityCommand.Parameters.Add(saveActivityCommand, "@Type");
+                    saveActivityCommand.Parameters.Add(saveActivityCommand, "@ItemId");
+                    saveActivityCommand.Parameters.Add(saveActivityCommand, "@UserId");
+                    saveActivityCommand.Parameters.Add(saveActivityCommand, "@DateCreated");
+                    saveActivityCommand.Parameters.Add(saveActivityCommand, "@LogSeverity");
 
-            try
-            {
-                transaction = _connection.BeginTransaction();
+                    IDbTransaction transaction = null;
 
-                var index = 0;
+                    try
+                    {
+                        transaction = connection.BeginTransaction();
 
-                _saveActivityCommand.GetParameter(index++).Value = new Guid(entry.Id);
-                _saveActivityCommand.GetParameter(index++).Value = entry.Name;
-                _saveActivityCommand.GetParameter(index++).Value = entry.Overview;
-                _saveActivityCommand.GetParameter(index++).Value = entry.ShortOverview;
-                _saveActivityCommand.GetParameter(index++).Value = entry.Type;
-                _saveActivityCommand.GetParameter(index++).Value = entry.ItemId;
-                _saveActivityCommand.GetParameter(index++).Value = entry.UserId;
-                _saveActivityCommand.GetParameter(index++).Value = entry.Date;
-                _saveActivityCommand.GetParameter(index++).Value = entry.Severity.ToString();
+                        var index = 0;
 
-                _saveActivityCommand.Transaction = transaction;
+                        saveActivityCommand.GetParameter(index++).Value = new Guid(entry.Id);
+                        saveActivityCommand.GetParameter(index++).Value = entry.Name;
+                        saveActivityCommand.GetParameter(index++).Value = entry.Overview;
+                        saveActivityCommand.GetParameter(index++).Value = entry.ShortOverview;
+                        saveActivityCommand.GetParameter(index++).Value = entry.Type;
+                        saveActivityCommand.GetParameter(index++).Value = entry.ItemId;
+                        saveActivityCommand.GetParameter(index++).Value = entry.UserId;
+                        saveActivityCommand.GetParameter(index++).Value = entry.Date;
+                        saveActivityCommand.GetParameter(index++).Value = entry.Severity.ToString();
 
-                _saveActivityCommand.ExecuteNonQuery();
+                        saveActivityCommand.Transaction = transaction;
 
-                transaction.Commit();
-            }
-            catch (OperationCanceledException)
-            {
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
+                        saveActivityCommand.ExecuteNonQuery();
 
-                throw;
-            }
-            catch (Exception e)
-            {
-                Logger.ErrorException("Failed to save record:", e);
+                        transaction.Commit();
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
 
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
+                        throw;
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.ErrorException("Failed to save record:", e);
 
-                throw;
-            }
-            finally
-            {
-                if (transaction != null)
-                {
-                    transaction.Dispose();
-                }
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
 
-                WriteLock.Release();
+                        throw;
+                    }
+                    finally
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Dispose();
+                        }
+                    }
+                }
             }
         }
 
         public QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit)
         {
-            using (var cmd = _connection.CreateCommand())
+            using (var connection = CreateConnection(true).Result)
             {
-                cmd.CommandText = BaseActivitySelectText;
-
-                var whereClauses = new List<string>();
-
-                if (minDate.HasValue)
+                using (var cmd = connection.CreateCommand())
                 {
-                    whereClauses.Add("DateCreated>=@DateCreated");
-                    cmd.Parameters.Add(cmd, "@DateCreated", DbType.Date).Value = minDate.Value;
-                }
+                    cmd.CommandText = BaseActivitySelectText;
 
-                var whereTextWithoutPaging = whereClauses.Count == 0 ?
-                    string.Empty :
-                    " where " + string.Join(" AND ", whereClauses.ToArray());
+                    var whereClauses = new List<string>();
 
-                if (startIndex.HasValue && startIndex.Value > 0)
-                {
-                    var pagingWhereText = whereClauses.Count == 0 ?
+                    if (minDate.HasValue)
+                    {
+                        whereClauses.Add("DateCreated>=@DateCreated");
+                        cmd.Parameters.Add(cmd, "@DateCreated", DbType.Date).Value = minDate.Value;
+                    }
+
+                    var whereTextWithoutPaging = whereClauses.Count == 0 ?
                         string.Empty :
                         " where " + string.Join(" AND ", whereClauses.ToArray());
-                    
-                    whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM ActivityLogEntries {0} ORDER BY DateCreated DESC LIMIT {1})",
-                        pagingWhereText,
-                        startIndex.Value.ToString(_usCulture)));
-                }
 
-                var whereText = whereClauses.Count == 0 ? 
-                    string.Empty :
-                    " where " + string.Join(" AND ", whereClauses.ToArray());
-
-                cmd.CommandText += whereText;
+                    if (startIndex.HasValue && startIndex.Value > 0)
+                    {
+                        var pagingWhereText = whereClauses.Count == 0 ?
+                            string.Empty :
+                            " where " + string.Join(" AND ", whereClauses.ToArray());
 
-                cmd.CommandText += " ORDER BY DateCreated DESC";
+                        whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM ActivityLogEntries {0} ORDER BY DateCreated DESC LIMIT {1})",
+                            pagingWhereText,
+                            startIndex.Value.ToString(_usCulture)));
+                    }
 
-                if (limit.HasValue)
-                {
-                    cmd.CommandText += " LIMIT " + limit.Value.ToString(_usCulture);
-                }
+                    var whereText = whereClauses.Count == 0 ?
+                        string.Empty :
+                        " where " + string.Join(" AND ", whereClauses.ToArray());
 
-                cmd.CommandText += "; select count (Id) from ActivityLogEntries" + whereTextWithoutPaging;
+                    cmd.CommandText += whereText;
 
-                var list = new List<ActivityLogEntry>();
-                var count = 0;
+                    cmd.CommandText += " ORDER BY DateCreated DESC";
 
-                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
-                {
-                    while (reader.Read())
+                    if (limit.HasValue)
                     {
-                        list.Add(GetEntry(reader));
+                        cmd.CommandText += " LIMIT " + limit.Value.ToString(_usCulture);
                     }
 
-                    if (reader.NextResult() && reader.Read())
+                    cmd.CommandText += "; select count (Id) from ActivityLogEntries" + whereTextWithoutPaging;
+
+                    var list = new List<ActivityLogEntry>();
+                    var count = 0;
+
+                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
                     {
-                        count = reader.GetInt32(0);
+                        while (reader.Read())
+                        {
+                            list.Add(GetEntry(reader));
+                        }
+
+                        if (reader.NextResult() && reader.Read())
+                        {
+                            count = reader.GetInt32(0);
+                        }
                     }
-                }
 
-                return new QueryResult<ActivityLogEntry>()
-                {
-                    Items = list.ToArray(),
-                    TotalRecordCount = count
-                };
+                    return new QueryResult<ActivityLogEntry>()
+                    {
+                        Items = list.ToArray(),
+                        TotalRecordCount = count
+                    };
+                }
             }
         }
 
@@ -260,19 +249,5 @@ namespace MediaBrowser.Server.Implementations.Activity
 
             return info;
         }
-
-        protected override void CloseConnection()
-        {
-            if (_connection != null)
-            {
-                if (_connection.IsOpen())
-                {
-                    _connection.Close();
-                }
-
-                _connection.Dispose();
-                _connection = null;
-            }
-        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
index 6a9842cb2..41592865c 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
@@ -191,7 +191,7 @@ namespace MediaBrowser.Server.Implementations.Channels
 
             var dtoOptions = new DtoOptions();
 
-            var returnItems = _dtoService.GetBaseItemDtos(internalResult.Items, dtoOptions, user)
+            var returnItems = (await _dtoService.GetBaseItemDtos(internalResult.Items, dtoOptions, user).ConfigureAwait(false))
                 .ToArray();
 
             var result = new QueryResult<BaseItemDto>
@@ -596,7 +596,7 @@ namespace MediaBrowser.Server.Implementations.Channels
 
             var dtoOptions = new DtoOptions();
 
-            var returnItems = _dtoService.GetBaseItemDtos(items, dtoOptions, user)
+            var returnItems = (await _dtoService.GetBaseItemDtos(items, dtoOptions, user).ConfigureAwait(false))
                 .ToArray();
 
             var result = new QueryResult<BaseItemDto>
@@ -863,7 +863,7 @@ namespace MediaBrowser.Server.Implementations.Channels
 
             var dtoOptions = new DtoOptions();
 
-            var returnItems = _dtoService.GetBaseItemDtos(internalResult.Items, dtoOptions, user)
+            var returnItems = (await _dtoService.GetBaseItemDtos(internalResult.Items, dtoOptions, user).ConfigureAwait(false))
                 .ToArray();
 
             var result = new QueryResult<BaseItemDto>
@@ -1012,7 +1012,7 @@ namespace MediaBrowser.Server.Implementations.Channels
 
             var dtoOptions = new DtoOptions();
 
-            var returnItems = _dtoService.GetBaseItemDtos(internalResult.Items, dtoOptions, user)
+            var returnItems = (await _dtoService.GetBaseItemDtos(internalResult.Items, dtoOptions, user).ConfigureAwait(false))
                 .ToArray();
 
             var result = new QueryResult<BaseItemDto>
@@ -1172,8 +1172,7 @@ namespace MediaBrowser.Server.Implementations.Channels
         {
             items = ApplyFilters(items, query.Filters, user);
 
-            var sortBy = query.SortBy.Length == 0 ? new[] { ItemSortBy.SortName } : query.SortBy;
-            items = _libraryManager.Sort(items, user, sortBy, query.SortOrder ?? SortOrder.Ascending);
+            items = _libraryManager.Sort(items, user, query.SortBy, query.SortOrder ?? SortOrder.Ascending);
 
             var all = items.ToList();
             var totalCount = totalCountFromProvider ?? all.Count;
@@ -1250,10 +1249,22 @@ namespace MediaBrowser.Server.Implementations.Channels
                 {
                     item = GetItemById<MusicAlbum>(info.Id, channelProvider.Name, channelProvider.DataVersion, out isNew);
                 }
+                else if (info.FolderType == ChannelFolderType.MusicArtist)
+                {
+                    item = GetItemById<MusicArtist>(info.Id, channelProvider.Name, channelProvider.DataVersion, out isNew);
+                }
                 else if (info.FolderType == ChannelFolderType.PhotoAlbum)
                 {
                     item = GetItemById<PhotoAlbum>(info.Id, channelProvider.Name, channelProvider.DataVersion, out isNew);
                 }
+                else if (info.FolderType == ChannelFolderType.Series)
+                {
+                    item = GetItemById<Series>(info.Id, channelProvider.Name, channelProvider.DataVersion, out isNew);
+                }
+                else if (info.FolderType == ChannelFolderType.Season)
+                {
+                    item = GetItemById<Season>(info.Id, channelProvider.Name, channelProvider.DataVersion, out isNew);
+                }
                 else
                 {
                     item = GetItemById<Folder>(info.Id, channelProvider.Name, channelProvider.DataVersion, out isNew);
@@ -1307,6 +1318,28 @@ namespace MediaBrowser.Server.Implementations.Channels
                 item.OfficialRating = info.OfficialRating;
                 item.DateCreated = info.DateCreated ?? DateTime.UtcNow;
                 item.Tags = info.Tags;
+                item.HomePageUrl = info.HomePageUrl;
+            }
+            else if (info.Type == ChannelItemType.Folder && info.FolderType == ChannelFolderType.Container)
+            {
+                // At least update names of container folders
+                if (item.Name != info.Name)
+                {
+                    item.Name = info.Name;
+                    forceUpdate = true;
+                }
+            }
+
+            var hasArtists = item as IHasArtist;
+            if (hasArtists != null)
+            {
+                hasArtists.Artists = info.Artists;
+            }
+
+            var hasAlbumArtists = item as IHasAlbumArtist;
+            if (hasAlbumArtists != null)
+            {
+                hasAlbumArtists.AlbumArtists = info.AlbumArtists;
             }
 
             var trailer = item as Trailer;
diff --git a/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs b/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
index 561d46229..3e33066ae 100644
--- a/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
+++ b/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
@@ -20,7 +20,7 @@ namespace MediaBrowser.Server.Implementations.Collections
 
         public bool IsHiddenFromUser(User user)
         {
-            return !user.Configuration.DisplayCollectionsView;
+            return !ConfigurationManager.Configuration.DisplayCollectionsView;
         }
 
         public override string CollectionType
diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectEntryPoint.cs b/MediaBrowser.Server.Implementations/Connect/ConnectEntryPoint.cs
index ea12e332d..28a62c012 100644
--- a/MediaBrowser.Server.Implementations/Connect/ConnectEntryPoint.cs
+++ b/MediaBrowser.Server.Implementations/Connect/ConnectEntryPoint.cs
@@ -41,14 +41,15 @@ namespace MediaBrowser.Server.Implementations.Connect
 
         public void Run()
         {
-            Task.Run(() => LoadCachedAddress());
+            LoadCachedAddress();
 
             _timer = new PeriodicTimer(TimerCallback, null, TimeSpan.FromSeconds(5), TimeSpan.FromHours(3));
+            ((ConnectManager)_connectManager).Start();
         }
 
         private readonly string[] _ipLookups =
         {
-            "http://bot.whatismyipaddress.com", 
+            "http://bot.whatismyipaddress.com",
             "https://connect.emby.media/service/ip"
         };
 
@@ -78,17 +79,18 @@ namespace MediaBrowser.Server.Implementations.Connect
             }
 
             // If this produced an ipv6 address, try again
-            if (validIpAddress == null || validIpAddress.AddressFamily == AddressFamily.InterNetworkV6)
+            if (validIpAddress != null && validIpAddress.AddressFamily == AddressFamily.InterNetworkV6)
             {
                 foreach (var ipLookupUrl in _ipLookups)
                 {
                     try
                     {
-                        validIpAddress = await GetIpAddress(ipLookupUrl, true).ConfigureAwait(false);
+                        var newAddress = await GetIpAddress(ipLookupUrl, true).ConfigureAwait(false);
 
                         // Try to find the ipv4 address, if present
-                        if (validIpAddress.AddressFamily == AddressFamily.InterNetwork)
+                        if (newAddress.AddressFamily == AddressFamily.InterNetwork)
                         {
+                            validIpAddress = newAddress;
                             break;
                         }
                     }
@@ -162,6 +164,8 @@ namespace MediaBrowser.Server.Implementations.Connect
         {
             var path = CacheFilePath;
 
+            _logger.Info("Loading data from {0}", path);
+
             try
             {
                 var endpoint = _fileSystem.ReadAllText(path, Encoding.UTF8);
diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
index f3d545492..24750de94 100644
--- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
+++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
@@ -139,11 +139,14 @@ namespace MediaBrowser.Server.Implementations.Connect
             _securityManager = securityManager;
             _fileSystem = fileSystem;
 
-            _config.ConfigurationUpdated += _config_ConfigurationUpdated;
-
             LoadCachedData();
         }
 
+        internal void Start()
+        {
+            _config.ConfigurationUpdated += _config_ConfigurationUpdated;
+        }
+
         internal void OnWanAddressResolved(IPAddress address)
         {
             DiscoveredWanIpAddress = address;
@@ -177,7 +180,7 @@ namespace MediaBrowser.Server.Implementations.Connect
 
             try
             {
-                var localAddress = _appHost.LocalApiUrl;
+                var localAddress = await _appHost.GetLocalApiUrl().ConfigureAwait(false);
 
                 var hasExistingRecord = !string.IsNullOrWhiteSpace(ConnectServerId) &&
                                   !string.IsNullOrWhiteSpace(ConnectAccessKey);
@@ -217,24 +220,26 @@ namespace MediaBrowser.Server.Implementations.Connect
         }
 
         private string _lastReportedIdentifier;
-        private string GetConnectReportingIdentifier()
+        private async Task<string> GetConnectReportingIdentifier()
         {
-            return GetConnectReportingIdentifier(_appHost.LocalApiUrl, WanApiAddress);
+            var url = await _appHost.GetLocalApiUrl().ConfigureAwait(false);
+            return GetConnectReportingIdentifier(url, WanApiAddress);
         }
         private string GetConnectReportingIdentifier(string localAddress, string remoteAddress)
         {
             return (remoteAddress ?? string.Empty) + (localAddress ?? string.Empty);
         }
 
-        void _config_ConfigurationUpdated(object sender, EventArgs e)
+        async void _config_ConfigurationUpdated(object sender, EventArgs e)
         {
             // If info hasn't changed, don't report anything
-            if (string.Equals(_lastReportedIdentifier, GetConnectReportingIdentifier(), StringComparison.OrdinalIgnoreCase))
+            var connectIdentifier = await GetConnectReportingIdentifier().ConfigureAwait(false);
+            if (string.Equals(_lastReportedIdentifier, connectIdentifier, StringComparison.OrdinalIgnoreCase))
             {
                 return;
             }
 
-            UpdateConnectInfo();
+            await UpdateConnectInfo().ConfigureAwait(false);
         }
 
         private async Task CreateServerRegistration(string wanApiAddress, string localAddress)
@@ -357,6 +362,8 @@ namespace MediaBrowser.Server.Implementations.Connect
         {
             var path = CacheFilePath;
 
+            _logger.Info("Loading data from {0}", path);
+
             try
             {
                 lock (_dataFileLock)
diff --git a/MediaBrowser.Server.Implementations/Connect/Responses.cs b/MediaBrowser.Server.Implementations/Connect/Responses.cs
index e7c3f8154..f86527829 100644
--- a/MediaBrowser.Server.Implementations/Connect/Responses.cs
+++ b/MediaBrowser.Server.Implementations/Connect/Responses.cs
@@ -60,7 +60,6 @@ namespace MediaBrowser.Server.Implementations.Connect
         {
             return new ConnectUserPreferences
             {
-                GroupMoviesIntoBoxSets = config.GroupMoviesIntoBoxSets,
                 PlayDefaultAudioTrack = config.PlayDefaultAudioTrack,
                 SubtitleMode = config.SubtitleMode,
                 PreferredAudioLanguages = string.IsNullOrWhiteSpace(config.AudioLanguagePreference) ? new string[] { } : new[] { config.AudioLanguagePreference },
diff --git a/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs b/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs
index 947933561..3dfc04c26 100644
--- a/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs
+++ b/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs
@@ -28,6 +28,7 @@ namespace MediaBrowser.Server.Implementations.Devices
             return base.IsVisible(user) && HasChildren();
         }
 
+        [IgnoreDataMember]
         public override string CollectionType
         {
             get { return Model.Entities.CollectionType.Photos; }
diff --git a/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs b/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs
index 6b1af8d2d..c3db9140c 100644
--- a/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs
+++ b/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs
@@ -51,6 +51,11 @@ namespace MediaBrowser.Server.Implementations.Devices
 
         public async Task<DeviceInfo> RegisterDevice(string reportedId, string name, string appName, string appVersion, string usedByUserId)
         {
+            if (string.IsNullOrWhiteSpace(reportedId))
+            {
+                throw new ArgumentNullException("reportedId");
+            }
+
             var device = GetDevice(reportedId) ?? new DeviceInfo
             {
                 Id = reportedId
diff --git a/MediaBrowser.Server.Implementations/Devices/DeviceRepository.cs b/MediaBrowser.Server.Implementations/Devices/DeviceRepository.cs
index 368d21322..6e67af82b 100644
--- a/MediaBrowser.Server.Implementations/Devices/DeviceRepository.cs
+++ b/MediaBrowser.Server.Implementations/Devices/DeviceRepository.cs
@@ -23,7 +23,7 @@ namespace MediaBrowser.Server.Implementations.Devices
         private readonly ILogger _logger;
         private readonly IFileSystem _fileSystem;
 
-        private List<DeviceInfo> _devices;
+        private Dictionary<string, DeviceInfo> _devices;
 
         public DeviceRepository(IApplicationPaths appPaths, IJsonSerializer json, ILogger logger, IFileSystem fileSystem)
         {
@@ -46,12 +46,12 @@ namespace MediaBrowser.Server.Implementations.Devices
         public Task SaveDevice(DeviceInfo device)
         {
             var path = Path.Combine(GetDevicePath(device.Id), "device.json");
-			_fileSystem.CreateDirectory(Path.GetDirectoryName(path));
+            _fileSystem.CreateDirectory(Path.GetDirectoryName(path));
 
             lock (_syncLock)
             {
                 _json.SerializeToFile(device, path);
-                _devices = null;
+                _devices[device.Id] = device;
             }
             return Task.FromResult(true);
         }
@@ -95,9 +95,15 @@ namespace MediaBrowser.Server.Implementations.Devices
             {
                 if (_devices == null)
                 {
-                    _devices = LoadDevices().ToList();
+                    _devices = new Dictionary<string, DeviceInfo>(StringComparer.OrdinalIgnoreCase);
+
+                    var devices = LoadDevices().ToList();
+                    foreach (var device in devices)
+                    {
+                        _devices[device.Id] = device;
+                    }
                 }
-                return _devices.ToList();
+                return _devices.Values.ToList();
             }
         }
 
@@ -144,7 +150,7 @@ namespace MediaBrowser.Server.Implementations.Devices
                 catch (DirectoryNotFoundException)
                 {
                 }
-                
+
                 _devices = null;
             }
 
@@ -174,7 +180,7 @@ namespace MediaBrowser.Server.Implementations.Devices
         public void AddCameraUpload(string deviceId, LocalFileInfo file)
         {
             var path = Path.Combine(GetDevicePath(deviceId), "camerauploads.json");
-			_fileSystem.CreateDirectory(Path.GetDirectoryName(path));
+            _fileSystem.CreateDirectory(Path.GetDirectoryName(path));
 
             lock (_syncLock)
             {
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index dfbac47d5..8805d567a 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -86,8 +86,18 @@ namespace MediaBrowser.Server.Implementations.Dto
             return GetBaseItemDto(item, options, user, owner);
         }
 
-        public IEnumerable<BaseItemDto> GetBaseItemDtos(IEnumerable<BaseItem> items, DtoOptions options, User user = null, BaseItem owner = null)
+        public async Task<List<BaseItemDto>> GetBaseItemDtos(IEnumerable<BaseItem> items, DtoOptions options, User user = null, BaseItem owner = null)
         {
+            if (items == null)
+            {
+                throw new ArgumentNullException("items");
+            }
+
+            if (options == null)
+            {
+                throw new ArgumentNullException("options");
+            }
+
             var syncJobItems = GetSyncedItemProgress(options);
             var syncDictionary = GetSyncedItemProgressDictionary(syncJobItems);
 
@@ -97,7 +107,7 @@ namespace MediaBrowser.Server.Implementations.Dto
 
             foreach (var item in items)
             {
-                var dto = GetBaseItemDtoInternal(item, options, syncDictionary, user, owner);
+                var dto = await GetBaseItemDtoInternal(item, options, syncDictionary, user, owner).ConfigureAwait(false);
 
                 var tvChannel = item as LiveTvChannel;
                 if (tvChannel != null)
@@ -131,8 +141,7 @@ namespace MediaBrowser.Server.Implementations.Dto
 
             if (programTuples.Count > 0)
             {
-                var task = _livetvManager().AddInfoToProgramDto(programTuples, options.Fields, user);
-                Task.WaitAll(task);
+                await _livetvManager().AddInfoToProgramDto(programTuples, options.Fields, user).ConfigureAwait(false);
             }
 
             if (channelTuples.Count > 0)
@@ -159,7 +168,7 @@ namespace MediaBrowser.Server.Implementations.Dto
         {
             var syncProgress = GetSyncedItemProgress(options);
 
-            var dto = GetBaseItemDtoInternal(item, options, GetSyncedItemProgressDictionary(syncProgress), user, owner);
+            var dto = GetBaseItemDtoInternal(item, options, GetSyncedItemProgressDictionary(syncProgress), user, owner).Result;
             var tvChannel = item as LiveTvChannel;
             if (tvChannel != null)
             {
@@ -300,7 +309,7 @@ namespace MediaBrowser.Server.Implementations.Dto
             }
         }
 
-        private BaseItemDto GetBaseItemDtoInternal(BaseItem item, DtoOptions options, Dictionary<string, SyncedItemProgress> syncProgress, User user = null, BaseItem owner = null)
+        private async Task<BaseItemDto> GetBaseItemDtoInternal(BaseItem item, DtoOptions options, Dictionary<string, SyncedItemProgress> syncProgress, User user = null, BaseItem owner = null)
         {
             var fields = options.Fields;
 
@@ -349,7 +358,7 @@ namespace MediaBrowser.Server.Implementations.Dto
 
             if (user != null)
             {
-                AttachUserSpecificInfo(dto, item, user, fields, syncProgress);
+                await AttachUserSpecificInfo(dto, item, user, fields, syncProgress).ConfigureAwait(false);
             }
 
             var hasMediaSources = item as IHasMediaSources;
@@ -416,9 +425,9 @@ namespace MediaBrowser.Server.Implementations.Dto
         {
             var syncProgress = GetSyncedItemProgress(options);
 
-            var dto = GetBaseItemDtoInternal(item, options, GetSyncedItemProgressDictionary(syncProgress), user);
+            var dto = GetBaseItemDtoInternal(item, options, GetSyncedItemProgressDictionary(syncProgress), user).Result;
 
-            if (options.Fields.Contains(ItemFields.ItemCounts))
+            if (taggedItems != null && options.Fields.Contains(ItemFields.ItemCounts))
             {
                 SetItemByNameInfo(item, dto, taggedItems, user);
             }
@@ -465,26 +474,31 @@ namespace MediaBrowser.Server.Implementations.Dto
         /// <param name="user">The user.</param>
         /// <param name="fields">The fields.</param>
         /// <param name="syncProgress">The synchronize progress.</param>
-        private void AttachUserSpecificInfo(BaseItemDto dto, BaseItem item, User user, List<ItemFields> fields, Dictionary<string, SyncedItemProgress> syncProgress)
+        private async Task AttachUserSpecificInfo(BaseItemDto dto, BaseItem item, User user, List<ItemFields> fields, Dictionary<string, SyncedItemProgress> syncProgress)
         {
             if (item.IsFolder)
             {
-                var userData = _userDataRepository.GetUserData(user, item);
+                var folder = (Folder)item;
 
-                // Skip the user data manager because we've already looped through the recursive tree and don't want to do it twice
-                // TODO: Improve in future
-                dto.UserData = GetUserItemDataDto(userData);
+                if (item.SourceType == SourceType.Library && folder.SupportsUserDataFromChildren && fields.Contains(ItemFields.SyncInfo))
+                {
+                    // Skip the user data manager because we've already looped through the recursive tree and don't want to do it twice
+                    // TODO: Improve in future
+                    dto.UserData = GetUserItemDataDto(_userDataRepository.GetUserData(user, item));
 
-                var folder = (Folder)item;
+                    await SetSpecialCounts(folder, user, dto, fields, syncProgress).ConfigureAwait(false);
+
+                    dto.UserData.Played = dto.UserData.PlayedPercentage.HasValue &&
+                                          dto.UserData.PlayedPercentage.Value >= 100;
+                }
+                else
+                {
+                    dto.UserData = await _userDataRepository.GetUserDataDto(item, dto, user).ConfigureAwait(false);
+                }
 
                 if (item.SourceType == SourceType.Library)
                 {
                     dto.ChildCount = GetChildCount(folder, user);
-
-                    if (folder.SupportsUserDataFromChildren)
-                    {
-                        SetSpecialCounts(folder, user, dto, fields, syncProgress);
-                    }
                 }
 
                 if (fields.Contains(ItemFields.CumulativeRunTimeTicks))
@@ -496,13 +510,11 @@ namespace MediaBrowser.Server.Implementations.Dto
                 {
                     dto.DateLastMediaAdded = folder.DateLastMediaAdded;
                 }
-
-                dto.UserData.Played = dto.UserData.PlayedPercentage.HasValue && dto.UserData.PlayedPercentage.Value >= 100;
             }
 
             else
             {
-                dto.UserData = _userDataRepository.GetUserDataDto(item, user);
+                dto.UserData = _userDataRepository.GetUserDataDto(item, user).Result;
             }
 
             dto.PlayAccess = item.GetPlayAccess(user);
@@ -517,7 +529,7 @@ namespace MediaBrowser.Server.Implementations.Dto
 
                     if (season != null)
                     {
-                        dto.SeasonUserData = _userDataRepository.GetUserDataDto(season, user);
+                        dto.SeasonUserData = await _userDataRepository.GetUserDataDto(season, user).ConfigureAwait(false);
                     }
                 }
             }
@@ -537,8 +549,14 @@ namespace MediaBrowser.Server.Implementations.Dto
 
         private int GetChildCount(Folder folder, User user)
         {
-            return folder.GetChildren(user, true)
-                .Count();
+            // Right now this is too slow to calculate for top level folders on a per-user basis
+            // Just return something so that apps that are expecting a value won't think the folders are empty
+            if (folder is ICollectionFolder || folder is UserView)
+            {
+                return new Random().Next(1, 10);
+            }
+
+            return folder.GetChildCount(user);
         }
 
         /// <summary>
@@ -969,30 +987,12 @@ namespace MediaBrowser.Server.Implementations.Dto
 
             if (fields.Contains(ItemFields.Tags))
             {
-                var hasTags = item as IHasTags;
-                if (hasTags != null)
-                {
-                    dto.Tags = hasTags.Tags;
-                }
-
-                if (dto.Tags == null)
-                {
-                    dto.Tags = new List<string>();
-                }
+                dto.Tags = item.Tags;
             }
 
             if (fields.Contains(ItemFields.Keywords))
             {
-                var hasTags = item as IHasKeywords;
-                if (hasTags != null)
-                {
-                    dto.Keywords = hasTags.Keywords;
-                }
-
-                if (dto.Keywords == null)
-                {
-                    dto.Keywords = new List<string>();
-                }
+                dto.Keywords = item.Keywords;
             }
 
             if (fields.Contains(ItemFields.ProductionLocations))
@@ -1286,26 +1286,22 @@ namespace MediaBrowser.Server.Implementations.Dto
             {
                 dto.Artists = hasArtist.Artists;
 
-                dto.ArtistItems = hasArtist
-                    .Artists
+                var artistItems = _libraryManager.GetArtists(new InternalItemsQuery
+                {
+                    EnableTotalRecordCount = false,
+                    ItemIds = new[] { item.Id.ToString("N") }
+                });
+
+                dto.ArtistItems = artistItems.Items
                     .Select(i =>
                     {
-                        try
+                        var artist = i.Item1;
+                        return new NameIdPair
                         {
-                            var artist = _libraryManager.GetArtist(i);
-                            return new NameIdPair
-                            {
-                                Name = artist.Name,
-                                Id = artist.Id.ToString("N")
-                            };
-                        }
-                        catch (Exception ex)
-                        {
-                            _logger.ErrorException("Error getting artist", ex);
-                            return null;
-                        }
+                            Name = artist.Name,
+                            Id = artist.Id.ToString("N")
+                        };
                     })
-                    .Where(i => i != null)
                     .ToList();
             }
 
@@ -1314,26 +1310,22 @@ namespace MediaBrowser.Server.Implementations.Dto
             {
                 dto.AlbumArtist = hasAlbumArtist.AlbumArtists.FirstOrDefault();
 
-                dto.AlbumArtists = hasAlbumArtist
-                    .AlbumArtists
+                var artistItems = _libraryManager.GetAlbumArtists(new InternalItemsQuery
+                {
+                    EnableTotalRecordCount = false,
+                    ItemIds = new[] { item.Id.ToString("N") }
+                });
+
+                dto.AlbumArtists = artistItems.Items
                     .Select(i =>
                     {
-                        try
-                        {
-                            var artist = _libraryManager.GetArtist(i);
-                            return new NameIdPair
-                            {
-                                Name = artist.Name,
-                                Id = artist.Id.ToString("N")
-                            };
-                        }
-                        catch (Exception ex)
+                        var artist = i.Item1;
+                        return new NameIdPair
                         {
-                            _logger.ErrorException("Error getting album artist", ex);
-                            return null;
-                        }
+                            Name = artist.Name,
+                            Id = artist.Id.ToString("N")
+                        };
                     })
-                    .Where(i => i != null)
                     .ToList();
             }
 
@@ -1412,6 +1404,7 @@ namespace MediaBrowser.Server.Implementations.Dto
             if (episode != null)
             {
                 dto.IndexNumberEnd = episode.IndexNumberEnd;
+                dto.SeriesName = episode.SeriesName;
 
                 if (fields.Contains(ItemFields.AlternateEpisodeNumbers))
                 {
@@ -1427,74 +1420,65 @@ namespace MediaBrowser.Server.Implementations.Dto
                     dto.AirsBeforeSeasonNumber = episode.AirsBeforeSeasonNumber;
                 }
 
+                var seasonId = episode.SeasonId;
+                if (seasonId.HasValue)
+                {
+                    dto.SeasonId = seasonId.Value.ToString("N");
+                }
+
                 var episodeSeason = episode.Season;
                 if (episodeSeason != null)
                 {
-                    dto.SeasonId = episodeSeason.Id.ToString("N");
-
                     if (fields.Contains(ItemFields.SeasonName))
                     {
                         dto.SeasonName = episodeSeason.Name;
                     }
                 }
 
-                if (fields.Contains(ItemFields.SeriesGenres))
+                var episodeSeries = episode.Series;
+
+                if (episodeSeries != null)
                 {
-                    var episodeseries = episode.Series;
-                    if (episodeseries != null)
+                    if (fields.Contains(ItemFields.SeriesGenres))
                     {
-                        dto.SeriesGenres = episodeseries.Genres.ToList();
+                        dto.SeriesGenres = episodeSeries.Genres.ToList();
                     }
-                }
-            }
 
-            // Add SeriesInfo
-            var series = item as Series;
-            if (series != null)
-            {
-                dto.AirDays = series.AirDays;
-                dto.AirTime = series.AirTime;
-                dto.SeriesStatus = series.Status;
-
-                if (fields.Contains(ItemFields.Settings))
-                {
-                    dto.DisplaySpecialsWithSeasons = series.DisplaySpecialsWithSeasons;
-                }
-
-                dto.AnimeSeriesIndex = series.AnimeSeriesIndex;
-            }
-
-            if (episode != null)
-            {
-                series = episode.Series;
-
-                if (series != null)
-                {
-                    dto.SeriesId = GetDtoId(series);
-                    dto.SeriesName = series.Name;
+                    dto.SeriesId = GetDtoId(episodeSeries);
 
                     if (fields.Contains(ItemFields.AirTime))
                     {
-                        dto.AirTime = series.AirTime;
+                        dto.AirTime = episodeSeries.AirTime;
                     }
 
                     if (options.GetImageLimit(ImageType.Thumb) > 0)
                     {
-                        dto.SeriesThumbImageTag = GetImageCacheTag(series, ImageType.Thumb);
+                        dto.SeriesThumbImageTag = GetImageCacheTag(episodeSeries, ImageType.Thumb);
                     }
 
                     if (options.GetImageLimit(ImageType.Primary) > 0)
                     {
-                        dto.SeriesPrimaryImageTag = GetImageCacheTag(series, ImageType.Primary);
+                        dto.SeriesPrimaryImageTag = GetImageCacheTag(episodeSeries, ImageType.Primary);
                     }
 
                     if (fields.Contains(ItemFields.SeriesStudio))
                     {
-                        dto.SeriesStudio = series.Studios.FirstOrDefault();
+                        dto.SeriesStudio = episodeSeries.Studios.FirstOrDefault();
                     }
                 }
             }
 
+            // Add SeriesInfo
+            var series = item as Series;
+            if (series != null)
+            {
+                dto.AirDays = series.AirDays;
+                dto.AirTime = series.AirTime;
+                dto.SeriesStatus = series.Status;
+
+                dto.AnimeSeriesIndex = series.AnimeSeriesIndex;
+            }
+
             // Add SeasonInfo
             var season = item as Season;
             if (season != null)
@@ -1610,26 +1594,25 @@ namespace MediaBrowser.Server.Implementations.Dto
         /// <param name="fields">The fields.</param>
         /// <param name="syncProgress">The synchronize progress.</param>
         /// <returns>Task.</returns>
-        private void SetSpecialCounts(Folder folder, User user, BaseItemDto dto, List<ItemFields> fields, Dictionary<string, SyncedItemProgress> syncProgress)
+        private async Task SetSpecialCounts(Folder folder, User user, BaseItemDto dto, List<ItemFields> fields, Dictionary<string, SyncedItemProgress> syncProgress)
         {
             var recursiveItemCount = 0;
             var unplayed = 0;
 
             double totalPercentPlayed = 0;
             double totalSyncPercent = 0;
-            var addSyncInfo = fields.Contains(ItemFields.SyncInfo);
 
-            var children = folder.GetItems(new InternalItemsQuery
+            var children = await folder.GetItems(new InternalItemsQuery
             {
                 IsFolder = false,
                 Recursive = true,
                 ExcludeLocationTypes = new[] { LocationType.Virtual },
                 User = user
 
-            }).Result.Items;
+            }).ConfigureAwait(false);
 
             // Loop through each recursive child
-            foreach (var child in children)
+            foreach (var child in children.Items)
             {
                 var userdata = _userDataRepository.GetUserData(user, child);
 
@@ -1659,26 +1642,23 @@ namespace MediaBrowser.Server.Implementations.Dto
                     unplayed++;
                 }
 
-                if (addSyncInfo)
+                double percent = 0;
+                SyncedItemProgress syncItemProgress;
+                if (syncProgress.TryGetValue(child.Id.ToString("N"), out syncItemProgress))
                 {
-                    double percent = 0;
-                    SyncedItemProgress syncItemProgress;
-                    if (syncProgress.TryGetValue(child.Id.ToString("N"), out syncItemProgress))
+                    switch (syncItemProgress.Status)
                     {
-                        switch (syncItemProgress.Status)
-                        {
-                            case SyncJobItemStatus.Synced:
-                                percent = 100;
-                                break;
-                            case SyncJobItemStatus.Converting:
-                            case SyncJobItemStatus.ReadyToTransfer:
-                            case SyncJobItemStatus.Transferring:
-                                percent = 50;
-                                break;
-                        }
+                        case SyncJobItemStatus.Synced:
+                            percent = 100;
+                            break;
+                        case SyncJobItemStatus.Converting:
+                        case SyncJobItemStatus.ReadyToTransfer:
+                        case SyncJobItemStatus.Transferring:
+                            percent = 50;
+                            break;
                     }
-                    totalSyncPercent += percent;
                 }
+                totalSyncPercent += percent;
             }
 
             dto.RecursiveItemCount = recursiveItemCount;
@@ -1688,13 +1668,10 @@ namespace MediaBrowser.Server.Implementations.Dto
             {
                 dto.UserData.PlayedPercentage = totalPercentPlayed / recursiveItemCount;
 
-                if (addSyncInfo)
+                var pct = totalSyncPercent / recursiveItemCount;
+                if (pct > 0)
                 {
-                    var pct = totalSyncPercent / recursiveItemCount;
-                    if (pct > 0)
-                    {
-                        dto.SyncPercent = pct;
-                    }
+                    dto.SyncPercent = pct;
                 }
             }
         }
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs b/MediaBrowser.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs
index df6a9e654..d5f265dda 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs
@@ -8,6 +8,9 @@ using MediaBrowser.Model.Tasks;
 using System;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Model.LiveTv;
 
 namespace MediaBrowser.Server.Implementations.EntryPoints
 {
@@ -18,16 +21,18 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
         private readonly ITaskManager _iTaskManager;
         private readonly ISessionManager _sessionManager;
         private readonly IServerConfigurationManager _config;
+        private readonly ILiveTvManager _liveTvManager;
 
         private Timer _timer;
 
-        public AutomaticRestartEntryPoint(IServerApplicationHost appHost, ILogger logger, ITaskManager iTaskManager, ISessionManager sessionManager, IServerConfigurationManager config)
+        public AutomaticRestartEntryPoint(IServerApplicationHost appHost, ILogger logger, ITaskManager iTaskManager, ISessionManager sessionManager, IServerConfigurationManager config, ILiveTvManager liveTvManager)
         {
             _appHost = appHost;
             _logger = logger;
             _iTaskManager = iTaskManager;
             _sessionManager = sessionManager;
             _config = config;
+            _liveTvManager = liveTvManager;
         }
 
         public void Run()
@@ -44,34 +49,55 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
 
             if (_appHost.HasPendingRestart)
             {
-                _timer = new Timer(TimerCallback, null, TimeSpan.FromMinutes(5), TimeSpan.FromMinutes(5));
+                _timer = new Timer(TimerCallback, null, TimeSpan.FromMinutes(10), TimeSpan.FromMinutes(10));
             }
         }
 
-        private void TimerCallback(object state)
+        private async void TimerCallback(object state)
         {
-            if (_config.Configuration.EnableAutomaticRestart && IsIdle())
+            if (_config.Configuration.EnableAutomaticRestart)
             {
-                DisposeTimer();
+                var isIdle = await IsIdle().ConfigureAwait(false);
 
-                try
-                {
-                    _appHost.Restart();
-                }
-                catch (Exception ex)
+                if (isIdle)
                 {
-                    _logger.ErrorException("Error restarting server", ex);
+                    DisposeTimer();
+
+                    try
+                    {
+                        _appHost.Restart();
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.ErrorException("Error restarting server", ex);
+                    }
                 }
             }
         }
 
-        private bool IsIdle()
+        private async Task<bool> IsIdle()
         {
             if (_iTaskManager.ScheduledTasks.Any(i => i.State != TaskState.Idle))
             {
                 return false;
             }
 
+            if (_liveTvManager.Services.Count == 1)
+            {
+                try
+                {
+                    var timers = await _liveTvManager.GetTimers(new TimerQuery(), CancellationToken.None).ConfigureAwait(false);
+                    if (timers.Items.Any(i => i.Status == RecordingStatus.InProgress))
+                    {
+                        return false;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.ErrorException("Error getting timers", ex);
+                }
+            }
+
             var now = DateTime.UtcNow;
 
             return !_sessionManager.Sessions.Any(i => (now - i.LastActivityDate).TotalMinutes < 30);
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs b/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
index 5777a0af7..50ad3cfbc 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
@@ -93,7 +93,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             NatUtility.UnhandledException += NatUtility_UnhandledException;
             NatUtility.StartDiscovery();
 
-            _timer = new PeriodicTimer(s => _createdRules = new List<string>(), null, TimeSpan.FromMinutes(5), TimeSpan.FromMinutes(5));
+            _timer = new PeriodicTimer(ClearCreatedRules, null, TimeSpan.FromMinutes(5), TimeSpan.FromMinutes(5));
 
             _ssdp.MessageReceived += _ssdp_MessageReceived;
 
@@ -102,12 +102,43 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             _isStarted = true;
         }
 
+        private void ClearCreatedRules(object state)
+        {
+            _createdRules = new List<string>();
+            _usnsHandled = new List<string>();
+        }
+
         void _ssdp_MessageReceived(object sender, SsdpMessageEventArgs e)
         {
             var endpoint = e.EndPoint as IPEndPoint;
 
-            if (endpoint != null && e.LocalEndPoint != null)
+            if (endpoint == null || e.LocalEndPoint == null)
             {
+                return;
+            }
+
+            string usn;
+            if (!e.Headers.TryGetValue("USN", out usn)) usn = string.Empty;
+
+            string nt;
+            if (!e.Headers.TryGetValue("NT", out nt)) nt = string.Empty;
+
+            // Filter device type
+            if (usn.IndexOf("WANIPConnection:", StringComparison.OrdinalIgnoreCase) == -1 &&
+                     nt.IndexOf("WANIPConnection:", StringComparison.OrdinalIgnoreCase) == -1 &&
+                     usn.IndexOf("WANPPPConnection:", StringComparison.OrdinalIgnoreCase) == -1 &&
+                     nt.IndexOf("WANPPPConnection:", StringComparison.OrdinalIgnoreCase) == -1)
+            {
+                return;
+            }
+
+            var identifier = string.IsNullOrWhiteSpace(usn) ? nt : usn;
+
+            if (!_usnsHandled.Contains(identifier))
+            {
+                _usnsHandled.Add(identifier);
+
+                _logger.Debug("Calling Nat.Handle on " + identifier);
                 NatUtility.Handle(e.LocalEndPoint.Address, e.Message, endpoint, NatProtocol.Upnp);
             }
         }
@@ -151,6 +182,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
         }
 
         private List<string> _createdRules = new List<string>();
+        private List<string> _usnsHandled = new List<string>();
         private void CreateRules(INatDevice device)
         {
             // On some systems the device discovered event seems to fire repeatedly
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/RecordingNotifier.cs b/MediaBrowser.Server.Implementations/EntryPoints/RecordingNotifier.cs
new file mode 100644
index 000000000..cc4ef1972
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/EntryPoints/RecordingNotifier.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Controller.Plugins;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Logging;
+
+namespace MediaBrowser.Server.Implementations.EntryPoints
+{
+    public class RecordingNotifier : IServerEntryPoint
+    {
+        private readonly ILiveTvManager _liveTvManager;
+        private readonly ISessionManager _sessionManager;
+        private readonly IUserManager _userManager;
+        private readonly ILogger _logger;
+
+        public RecordingNotifier(ISessionManager sessionManager, IUserManager userManager, ILogger logger, ILiveTvManager liveTvManager)
+        {
+            _sessionManager = sessionManager;
+            _userManager = userManager;
+            _logger = logger;
+            _liveTvManager = liveTvManager;
+        }
+
+        public void Run()
+        {
+            _liveTvManager.TimerCancelled += _liveTvManager_TimerCancelled;
+            _liveTvManager.SeriesTimerCancelled += _liveTvManager_SeriesTimerCancelled;
+            _liveTvManager.TimerCreated += _liveTvManager_TimerCreated;
+            _liveTvManager.SeriesTimerCreated += _liveTvManager_SeriesTimerCreated;
+        }
+
+        private void _liveTvManager_SeriesTimerCreated(object sender, Model.Events.GenericEventArgs<TimerEventInfo> e)
+        {
+            SendMessage("SeriesTimerCreated", e.Argument);
+        }
+
+        private void _liveTvManager_TimerCreated(object sender, Model.Events.GenericEventArgs<TimerEventInfo> e)
+        {
+            SendMessage("TimerCreated", e.Argument);
+        }
+
+        private void _liveTvManager_SeriesTimerCancelled(object sender, Model.Events.GenericEventArgs<TimerEventInfo> e)
+        {
+            SendMessage("SeriesTimerCancelled", e.Argument);
+        }
+
+        private void _liveTvManager_TimerCancelled(object sender, Model.Events.GenericEventArgs<TimerEventInfo> e)
+        {
+            SendMessage("TimerCancelled", e.Argument);
+        }
+
+        private async void SendMessage(string name, TimerEventInfo info)
+        {
+            var users = _userManager.Users.Where(i => i.Policy.EnableLiveTvAccess).ToList();
+
+            foreach (var user in users)
+            {
+                try
+                {
+                    await _sessionManager.SendMessageToUserSessions<TimerEventInfo>(user.Id.ToString("N"), name, info, CancellationToken.None);
+                }
+                catch (Exception ex)
+                {
+                    _logger.ErrorException("Error sending message", ex);
+                }
+            }
+        }
+
+        public void Dispose()
+        {
+            _liveTvManager.TimerCancelled -= _liveTvManager_TimerCancelled;
+            _liveTvManager.SeriesTimerCancelled -= _liveTvManager_SeriesTimerCancelled;
+            _liveTvManager.TimerCreated -= _liveTvManager_TimerCreated;
+            _liveTvManager.SeriesTimerCreated -= _liveTvManager_SeriesTimerCreated;
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs b/MediaBrowser.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
index b059e4144..b616b7761 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
@@ -119,7 +119,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
                         .DistinctBy(i => i.Id)
                         .Select(i =>
                         {
-                            var dto = _userDataManager.GetUserDataDto(i, user);
+                            var dto = _userDataManager.GetUserDataDto(i, user).Result;
                             dto.ItemId = i.Id.ToString("N");
                             return dto;
                         })
diff --git a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
index 83801b3e7..2109f8d59 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
@@ -562,9 +562,10 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
                     series = _libraryManager.GetItemList(new Controller.Entities.InternalItemsQuery
                     {
                         IncludeItemTypes = new[] { typeof(Series).Name },
-                        Recursive = true
-                    }).Cast<Series>()
-                    .FirstOrDefault(i => string.Equals(i.Name, info.ItemName, StringComparison.OrdinalIgnoreCase));
+                        Recursive = true,
+                        Name = info.ItemName
+
+                    }).Cast<Series>().FirstOrDefault();
                 }
             }
 
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index c5cb810e5..f091f0f1f 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -106,7 +106,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
                 }
             });
 
-            HostContext.GlobalResponseFilters.Add(new ResponseFilter(_logger, () => _config.Configuration.DenyIFrameEmbedding).FilterResponse);
+            HostContext.GlobalResponseFilters.Add(new ResponseFilter(_logger).FilterResponse);
         }
 
         public override void OnAfterInit()
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
index 6cedaa6a9..1d4829260 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -294,7 +294,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             return null;
         }
 
-        public object GetStaticFileResult(IRequest requestContext,
+        public Task<object> GetStaticFileResult(IRequest requestContext,
             string path,
             FileShare fileShare = FileShare.Read)
         {
@@ -310,7 +310,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             });
         }
 
-        public object GetStaticFileResult(IRequest requestContext,
+        public Task<object> GetStaticFileResult(IRequest requestContext,
             StaticFileResultOptions options)
         {
             var path = options.Path;
@@ -351,7 +351,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             return _fileSystem.GetFileStream(path, FileMode.Open, FileAccess.Read, fileShare);
         }
 
-        public object GetStaticResult(IRequest requestContext,
+        public Task<object> GetStaticResult(IRequest requestContext,
             Guid cacheKey,
             DateTime? lastDateModified,
             TimeSpan? cacheDuration,
@@ -372,7 +372,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             });
         }
 
-        public object GetStaticResult(IRequest requestContext, StaticResultOptions options)
+        public async Task<object> GetStaticResult(IRequest requestContext, StaticResultOptions options)
         {
             var cacheKey = options.CacheKey;
             options.ResponseHeaders = options.ResponseHeaders ?? new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
@@ -398,7 +398,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             }
 
             var compress = ShouldCompressResponse(requestContext, contentType);
-            var hasOptions = GetStaticResult(requestContext, options, compress).Result;
+            var hasOptions = await GetStaticResult(requestContext, options, compress).ConfigureAwait(false);
             AddResponseHeaders(hasOptions, options.ResponseHeaders);
 
             return hasOptions;
diff --git a/MediaBrowser.Server.Implementations/HttpServer/LoggerUtils.cs b/MediaBrowser.Server.Implementations/HttpServer/LoggerUtils.cs
index ce8100025..bfbb228ed 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/LoggerUtils.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/LoggerUtils.cs
@@ -35,7 +35,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         public static void LogResponse(ILogger logger, int statusCode, string url, string endPoint, TimeSpan duration)
         {
             var durationMs = duration.TotalMilliseconds;
-            var logSuffix = durationMs >= 1000 ? "ms (slow)" : "ms";
+            var logSuffix = durationMs >= 1000 && durationMs < 60000 ? "ms (slow)" : "ms";
 
             logger.Info("HTTP Response {0} to {1}. Time: {2}{3}. {4}", statusCode, endPoint, Convert.ToInt32(durationMs).ToString(CultureInfo.InvariantCulture), logSuffix, url);
         }
diff --git a/MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs b/MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs
index 020856886..fb4397462 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs
@@ -39,6 +39,9 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         /// </summary>
         private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
 
+        public Func<IDisposable> ResultScope { get; set; }
+        public List<Cookie> Cookies { get; private set; }
+
         /// <summary>
         /// Additional HTTP Headers
         /// </summary>
@@ -81,6 +84,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             Options["Accept-Ranges"] = "bytes";
             StatusCode = HttpStatusCode.PartialContent;
 
+            Cookies = new List<Cookie>();
             SetRangeValues();
         }
 
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs b/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
index f993d4437..ee05702f4 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
@@ -12,12 +12,10 @@ namespace MediaBrowser.Server.Implementations.HttpServer
     {
         private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
         private readonly ILogger _logger;
-        private readonly Func<bool> _denyIframeEmbedding;
 
-        public ResponseFilter(ILogger logger, Func<bool> denyIframeEmbedding)
+        public ResponseFilter(ILogger logger)
         {
             _logger = logger;
-            _denyIframeEmbedding = denyIframeEmbedding;
         }
 
         /// <summary>
@@ -31,11 +29,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             // Try to prevent compatibility view
             res.AddHeader("X-UA-Compatible", "IE=Edge");
 
-            if (_denyIframeEmbedding())
-            {
-                res.AddHeader("X-Frame-Options", "SAMEORIGIN");
-            }
-
             var exception = dto as Exception;
 
             if (exception != null)
diff --git a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
index 357f5c976..bc3e7b163 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
@@ -104,6 +104,10 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
                     {
                         info.DeviceId = tokenInfo.DeviceId;
                     }
+                    if (string.IsNullOrWhiteSpace(info.Version))
+                    {
+                        info.Version = tokenInfo.AppVersion;
+                    }
                 }
                 else
                 {
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/RequestMono.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/RequestMono.cs
index ed9e17b6b..efa850922 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/RequestMono.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/RequestMono.cs
@@ -4,6 +4,7 @@ using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Web;
+using ServiceStack;
 using ServiceStack.Web;
 
 namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
@@ -116,6 +117,21 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
             }
         }
 
+        public string Accept
+        {
+            get
+            {
+                return string.IsNullOrEmpty(request.Headers[HttpHeaders.Accept]) ? null : request.Headers[HttpHeaders.Accept];
+            }
+        }
+
+        public string Authorization
+        {
+            get
+            {
+                return string.IsNullOrEmpty(request.Headers[HttpHeaders.Authorization]) ? null : request.Headers[HttpHeaders.Authorization];
+            }
+        }
 
         protected bool validate_cookies, validate_query_string, validate_form;
         protected bool checked_cookies, checked_query_string, checked_form;
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs
index 30849d441..c7d889505 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs
@@ -22,7 +22,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
             this.OperationName = operationName;
             this.RequestAttributes = requestAttributes;
             this.request = httpContext.Request;
-            this.response = new WebSocketSharpResponse(logger, httpContext.Response);
+            this.response = new WebSocketSharpResponse(logger, httpContext.Response, this);
 
             this.RequestPreferences = new RequestPreferences(this);
         }
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
index 171dacb22..e08be8bd1 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using MediaBrowser.Model.Logging;
@@ -14,14 +15,17 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
         private readonly ILogger _logger;
         private readonly HttpListenerResponse response;
 
-        public WebSocketSharpResponse(ILogger logger, HttpListenerResponse response)
+        public WebSocketSharpResponse(ILogger logger, HttpListenerResponse response, IRequest request)
         {
             _logger = logger;
             this.response = response;
+            Items = new Dictionary<string, object>();
+            Request = request;
         }
 
+        public IRequest Request { get; private set; }
         public bool UseBufferedStream { get; set; }
-
+        public Dictionary<string, object> Items { get; private set; }
         public object OriginalResponse
         {
             get { return response; }
@@ -58,6 +62,11 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
             response.AddHeader(name, value);
         }
 
+        public string GetHeader(string name)
+        {
+            return response.Headers[name];
+        }
+
         public void Redirect(string url)
         {
             response.Redirect(url);
@@ -142,5 +151,9 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
         }
 
         public bool KeepAlive { get; set; }
+
+        public void ClearCookies()
+        {
+        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs b/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs
index aeaac80e8..d91f316d6 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs
@@ -25,7 +25,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
             var requestedFile = Path.Combine(swaggerDirectory, request.ResourceName.Replace('/', Path.DirectorySeparatorChar));
 
-            return ResultFactory.GetStaticFileResult(Request, requestedFile);
+            return ResultFactory.GetStaticFileResult(Request, requestedFile).Result;
         }
 
         /// <summary>
diff --git a/MediaBrowser.Server.Implementations/IO/FileRefresher.cs b/MediaBrowser.Server.Implementations/IO/FileRefresher.cs
new file mode 100644
index 000000000..4bea6ad34
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/IO/FileRefresher.cs
@@ -0,0 +1,289 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using CommonIO;
+using MediaBrowser.Common.Events;
+using MediaBrowser.Common.ScheduledTasks;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Server.Implementations.ScheduledTasks;
+
+namespace MediaBrowser.Server.Implementations.IO
+{
+    public class FileRefresher : IDisposable
+    {
+        private ILogger Logger { get; set; }
+        private ITaskManager TaskManager { get; set; }
+        private ILibraryManager LibraryManager { get; set; }
+        private IServerConfigurationManager ConfigurationManager { get; set; }
+        private readonly IFileSystem _fileSystem;
+        private readonly List<string> _affectedPaths = new List<string>();
+        private Timer _timer;
+        private readonly object _timerLock = new object();
+        public string Path { get; private set; }
+
+        public event EventHandler<EventArgs> Completed;
+
+        public FileRefresher(string path, IFileSystem fileSystem, IServerConfigurationManager configurationManager, ILibraryManager libraryManager, ITaskManager taskManager, ILogger logger)
+        {
+            logger.Debug("New file refresher created for {0}", path);
+            Path = path;
+            _affectedPaths.Add(path);
+
+            _fileSystem = fileSystem;
+            ConfigurationManager = configurationManager;
+            LibraryManager = libraryManager;
+            TaskManager = taskManager;
+            Logger = logger;
+        }
+
+        private void AddAffectedPath(string path)
+        {
+            if (!_affectedPaths.Contains(path, StringComparer.Ordinal))
+            {
+                _affectedPaths.Add(path);
+            }
+        }
+
+        public void AddPath(string path)
+        {
+            lock (_timerLock)
+            {
+                AddAffectedPath(path);
+            }
+            RestartTimer();
+        }
+
+        public void RestartTimer()
+        {
+            lock (_timerLock)
+            {
+                if (_timer == null)
+                {
+                    _timer = new Timer(OnTimerCallback, null, TimeSpan.FromSeconds(ConfigurationManager.Configuration.LibraryMonitorDelay), TimeSpan.FromMilliseconds(-1));
+                }
+                else
+                {
+                    _timer.Change(TimeSpan.FromSeconds(ConfigurationManager.Configuration.LibraryMonitorDelay), TimeSpan.FromMilliseconds(-1));
+                }
+            }
+        }
+
+        public void ResetPath(string path, string affectedFile)
+        {
+            lock (_timerLock)
+            {
+                Logger.Debug("Resetting file refresher from {0} to {1}", Path, path);
+
+                Path = path;
+                AddAffectedPath(path);
+
+                if (!string.IsNullOrWhiteSpace(affectedFile))
+                {
+                    AddAffectedPath(affectedFile);
+                }
+            }
+            RestartTimer();
+        }
+
+        private async void OnTimerCallback(object state)
+        {
+            List<string> paths;
+
+            lock (_timerLock)
+            {
+                paths = _affectedPaths.ToList();
+            }
+
+            // Extend the timer as long as any of the paths are still being written to.
+            if (paths.Any(IsFileLocked))
+            {
+                Logger.Info("Timer extended.");
+                RestartTimer();
+                return;
+            }
+
+            Logger.Debug("Timer stopped.");
+
+            DisposeTimer();
+            EventHelper.FireEventIfNotNull(Completed, this, EventArgs.Empty, Logger);
+
+            try
+            {
+                await ProcessPathChanges(paths.ToList()).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                Logger.ErrorException("Error processing directory changes", ex);
+            }
+        }
+
+        private async Task ProcessPathChanges(List<string> paths)
+        {
+            var itemsToRefresh = paths
+                .Select(GetAffectedBaseItem)
+                .Where(item => item != null)
+                .Distinct()
+                .ToList();
+
+            foreach (var p in paths)
+            {
+                Logger.Info(p + " reports change.");
+            }
+
+            // If the root folder changed, run the library task so the user can see it
+            if (itemsToRefresh.Any(i => i is AggregateFolder))
+            {
+                TaskManager.CancelIfRunningAndQueue<RefreshMediaLibraryTask>();
+                return;
+            }
+
+            foreach (var item in itemsToRefresh)
+            {
+                Logger.Info(item.Name + " (" + item.Path + ") will be refreshed.");
+
+                try
+                {
+                    await item.ChangedExternally().ConfigureAwait(false);
+                }
+                catch (IOException ex)
+                {
+                    // For now swallow and log. 
+                    // Research item: If an IOException occurs, the item may be in a disconnected state (media unavailable)
+                    // Should we remove it from it's parent?
+                    Logger.ErrorException("Error refreshing {0}", ex, item.Name);
+                }
+                catch (Exception ex)
+                {
+                    Logger.ErrorException("Error refreshing {0}", ex, item.Name);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the affected base item.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns>BaseItem.</returns>
+        private BaseItem GetAffectedBaseItem(string path)
+        {
+            BaseItem item = null;
+
+            while (item == null && !string.IsNullOrEmpty(path))
+            {
+                item = LibraryManager.FindByPath(path, null);
+
+                path = System.IO.Path.GetDirectoryName(path);
+            }
+
+            if (item != null)
+            {
+                // If the item has been deleted find the first valid parent that still exists
+                while (!_fileSystem.DirectoryExists(item.Path) && !_fileSystem.FileExists(item.Path))
+                {
+                    item = item.GetParent();
+
+                    if (item == null)
+                    {
+                        break;
+                    }
+                }
+            }
+
+            return item;
+        }
+
+        private bool IsFileLocked(string path)
+        {
+            if (Environment.OSVersion.Platform != PlatformID.Win32NT)
+            {
+                // Causing lockups on linux
+                return false;
+            }
+
+            try
+            {
+                var data = _fileSystem.GetFileSystemInfo(path);
+
+                if (!data.Exists
+                    || data.IsDirectory
+
+                    // Opening a writable stream will fail with readonly files
+                    || data.Attributes.HasFlag(FileAttributes.ReadOnly))
+                {
+                    return false;
+                }
+            }
+            catch (IOException)
+            {
+                return false;
+            }
+            catch (Exception ex)
+            {
+                Logger.ErrorException("Error getting file system info for: {0}", ex, path);
+                return false;
+            }
+
+            // In order to determine if the file is being written to, we have to request write access
+            // But if the server only has readonly access, this is going to cause this entire algorithm to fail
+            // So we'll take a best guess about our access level
+            var requestedFileAccess = ConfigurationManager.Configuration.SaveLocalMeta
+                ? FileAccess.ReadWrite
+                : FileAccess.Read;
+
+            try
+            {
+                using (_fileSystem.GetFileStream(path, FileMode.Open, requestedFileAccess, FileShare.ReadWrite))
+                {
+                    //file is not locked
+                    return false;
+                }
+            }
+            catch (DirectoryNotFoundException)
+            {
+                // File may have been deleted
+                return false;
+            }
+            catch (FileNotFoundException)
+            {
+                // File may have been deleted
+                return false;
+            }
+            catch (IOException)
+            {
+                //the file is unavailable because it is:
+                //still being written to
+                //or being processed by another thread
+                //or does not exist (has already been processed)
+                Logger.Debug("{0} is locked.", path);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                Logger.ErrorException("Error determining if file is locked: {0}", ex, path);
+                return false;
+            }
+        }
+
+        private void DisposeTimer()
+        {
+            lock (_timerLock)
+            {
+                if (_timer != null)
+                {
+                    _timer.Dispose();
+                }
+            }
+        }
+
+        public void Dispose()
+        {
+            DisposeTimer();
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
index 09ca134d1..0690d62dd 100644
--- a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
+++ b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
@@ -26,13 +26,9 @@ namespace MediaBrowser.Server.Implementations.IO
         /// </summary>
         private readonly ConcurrentDictionary<string, FileSystemWatcher> _fileSystemWatchers = new ConcurrentDictionary<string, FileSystemWatcher>(StringComparer.OrdinalIgnoreCase);
         /// <summary>
-        /// The update timer
-        /// </summary>
-        private Timer _updateTimer;
-        /// <summary>
         /// The affected paths
         /// </summary>
-        private readonly ConcurrentDictionary<string, string> _affectedPaths = new ConcurrentDictionary<string, string>();
+        private readonly List<FileRefresher> _activeRefreshers = new List<FileRefresher>();
 
         /// <summary>
         /// A dynamic list of paths that should be ignored.  Added to during our own file sytem modifications.
@@ -44,8 +40,8 @@ namespace MediaBrowser.Server.Implementations.IO
         /// </summary>
         private readonly IReadOnlyList<string> _alwaysIgnoreFiles = new List<string>
         {
-            "thumbs.db", 
-            "small.jpg", 
+            "thumbs.db",
+            "small.jpg",
             "albumart.jpg",
 
             // WMC temp recording directories that will constantly be written to
@@ -54,11 +50,6 @@ namespace MediaBrowser.Server.Implementations.IO
         };
 
         /// <summary>
-        /// The timer lock
-        /// </summary>
-        private readonly object _timerLock = new object();
-
-        /// <summary>
         /// Add the path to our temporary ignore list.  Use when writing to a path within our listening scope.
         /// </summary>
         /// <param name="path">The path.</param>
@@ -463,226 +454,58 @@ namespace MediaBrowser.Server.Implementations.IO
             if (monitorPath)
             {
                 // Avoid implicitly captured closure
-                var affectedPath = path;
-                _affectedPaths.AddOrUpdate(path, path, (key, oldValue) => affectedPath);
-            }
-
-            RestartTimer();
-        }
-
-        private void RestartTimer()
-        {
-            lock (_timerLock)
-            {
-                if (_updateTimer == null)
-                {
-                    _updateTimer = new Timer(TimerStopped, null, TimeSpan.FromSeconds(ConfigurationManager.Configuration.LibraryMonitorDelay), TimeSpan.FromMilliseconds(-1));
-                }
-                else
-                {
-                    _updateTimer.Change(TimeSpan.FromSeconds(ConfigurationManager.Configuration.LibraryMonitorDelay), TimeSpan.FromMilliseconds(-1));
-                }
-            }
-        }
-
-        /// <summary>
-        /// Timers the stopped.
-        /// </summary>
-        /// <param name="stateInfo">The state info.</param>
-        private async void TimerStopped(object stateInfo)
-        {
-            // Extend the timer as long as any of the paths are still being written to.
-            if (_affectedPaths.Any(p => IsFileLocked(p.Key)))
-            {
-                Logger.Info("Timer extended.");
-                RestartTimer();
-                return;
-            }
-
-            Logger.Debug("Timer stopped.");
-
-            DisposeTimer();
-
-            var paths = _affectedPaths.Keys.ToList();
-            _affectedPaths.Clear();
-
-            try
-            {
-                await ProcessPathChanges(paths).ConfigureAwait(false);
-            }
-            catch (Exception ex)
-            {
-                Logger.ErrorException("Error processing directory changes", ex);
+                CreateRefresher(path);
             }
         }
 
-        private bool IsFileLocked(string path)
+        private void CreateRefresher(string path)
         {
-            if (Environment.OSVersion.Platform != PlatformID.Win32NT)
-            {
-                // Causing lockups on linux
-                return false;
-            }
+            var parentPath = Path.GetDirectoryName(path);
 
-            try
+            lock (_activeRefreshers)
             {
-                var data = _fileSystem.GetFileSystemInfo(path);
-
-                if (!data.Exists
-                    || data.IsDirectory
-
-                    // Opening a writable stream will fail with readonly files
-                    || data.Attributes.HasFlag(FileAttributes.ReadOnly))
+                var refreshers = _activeRefreshers.ToList();
+                foreach (var refresher in refreshers)
                 {
-                    return false;
-                }
-            }
-            catch (IOException)
-            {
-                return false;
-            }
-            catch (Exception ex)
-            {
-                Logger.ErrorException("Error getting file system info for: {0}", ex, path);
-                return false;
-            }
-
-            // In order to determine if the file is being written to, we have to request write access
-            // But if the server only has readonly access, this is going to cause this entire algorithm to fail
-            // So we'll take a best guess about our access level
-            var requestedFileAccess = ConfigurationManager.Configuration.SaveLocalMeta
-                ? FileAccess.ReadWrite
-                : FileAccess.Read;
+                    // Path is already being refreshed
+                    if (string.Equals(path, refresher.Path, StringComparison.Ordinal))
+                    {
+                        refresher.RestartTimer();
+                        return;
+                    }
 
-            try
-            {
-                using (_fileSystem.GetFileStream(path, FileMode.Open, requestedFileAccess, FileShare.ReadWrite))
-                {
-                    if (_updateTimer != null)
+                    // Parent folder is already being refreshed
+                    if (_fileSystem.ContainsSubPath(refresher.Path, path))
                     {
-                        //file is not locked
-                        return false;
+                        refresher.AddPath(path);
+                        return;
                     }
-                }
-            }
-            catch (DirectoryNotFoundException)
-            {
-                // File may have been deleted
-                return false;
-            }
-            catch (FileNotFoundException)
-            {
-                // File may have been deleted
-                return false;
-            }
-            catch (IOException)
-            {
-                //the file is unavailable because it is:
-                //still being written to
-                //or being processed by another thread
-                //or does not exist (has already been processed)
-                Logger.Debug("{0} is locked.", path);
-                return true;
-            }
-            catch (Exception ex)
-            {
-                Logger.ErrorException("Error determining if file is locked: {0}", ex, path);
-                return false;
-            }
 
-            return false;
-        }
+                    // New path is a parent
+                    if (_fileSystem.ContainsSubPath(path, refresher.Path))
+                    {
+                        refresher.ResetPath(path, null);
+                        return;
+                    }
 
-        private void DisposeTimer()
-        {
-            lock (_timerLock)
-            {
-                if (_updateTimer != null)
-                {
-                    _updateTimer.Dispose();
-                    _updateTimer = null;
+                    // They are siblings. Rebase the refresher to the parent folder.
+                    if (string.Equals(parentPath, Path.GetDirectoryName(refresher.Path), StringComparison.Ordinal))
+                    {
+                        refresher.ResetPath(parentPath, path);
+                        return;
+                    }
                 }
-            }
-        }
-
-        /// <summary>
-        /// Processes the path changes.
-        /// </summary>
-        /// <param name="paths">The paths.</param>
-        /// <returns>Task.</returns>
-        private async Task ProcessPathChanges(List<string> paths)
-        {
-            var itemsToRefresh = paths
-                .Select(GetAffectedBaseItem)
-                .Where(item => item != null)
-                .Distinct()
-                .ToList();
-
-            foreach (var p in paths)
-            {
-                Logger.Info(p + " reports change.");
-            }
-
-            // If the root folder changed, run the library task so the user can see it
-            if (itemsToRefresh.Any(i => i is AggregateFolder))
-            {
-                TaskManager.CancelIfRunningAndQueue<RefreshMediaLibraryTask>();
-                return;
-            }
-
-            foreach (var item in itemsToRefresh)
-            {
-                Logger.Info(item.Name + " (" + item.Path + ") will be refreshed.");
 
-                try
-                {
-                    await item.ChangedExternally().ConfigureAwait(false);
-                }
-                catch (IOException ex)
-                {
-                    // For now swallow and log. 
-                    // Research item: If an IOException occurs, the item may be in a disconnected state (media unavailable)
-                    // Should we remove it from it's parent?
-                    Logger.ErrorException("Error refreshing {0}", ex, item.Name);
-                }
-                catch (Exception ex)
-                {
-                    Logger.ErrorException("Error refreshing {0}", ex, item.Name);
-                }
+                var newRefresher = new FileRefresher(path, _fileSystem, ConfigurationManager, LibraryManager, TaskManager, Logger);
+                newRefresher.Completed += NewRefresher_Completed;
+                _activeRefreshers.Add(newRefresher);
             }
         }
 
-        /// <summary>
-        /// Gets the affected base item.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>BaseItem.</returns>
-        private BaseItem GetAffectedBaseItem(string path)
+        private void NewRefresher_Completed(object sender, EventArgs e)
         {
-            BaseItem item = null;
-
-            while (item == null && !string.IsNullOrEmpty(path))
-            {
-                item = LibraryManager.FindByPath(path, null);
-
-                path = Path.GetDirectoryName(path);
-            }
-
-            if (item != null)
-            {
-                // If the item has been deleted find the first valid parent that still exists
-				while (!_fileSystem.DirectoryExists(item.Path) && !_fileSystem.FileExists(item.Path))
-                {
-                    item = item.GetParent();
-
-                    if (item == null)
-                    {
-                        break;
-                    }
-                }
-            }
-
-            return item;
+            var refresher = (FileRefresher)sender;
+            DisposeRefresher(refresher);
         }
 
         /// <summary>
@@ -713,10 +536,29 @@ namespace MediaBrowser.Server.Implementations.IO
                 watcher.Dispose();
             }
 
-            DisposeTimer();
-
             _fileSystemWatchers.Clear();
-            _affectedPaths.Clear();
+            DisposeRefreshers();
+        }
+
+        private void DisposeRefresher(FileRefresher refresher)
+        {
+            lock (_activeRefreshers)
+            {
+                refresher.Dispose();
+                _activeRefreshers.Remove(refresher);
+            }
+        }
+
+        private void DisposeRefreshers()
+        {
+            lock (_activeRefreshers)
+            {
+                foreach (var refresher in _activeRefreshers.ToList())
+                {
+                    refresher.Dispose();
+                }
+                _activeRefreshers.Clear();
+            }
         }
 
         /// <summary>
diff --git a/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs b/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
index 49012c65a..7c7a535cd 100644
--- a/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
+++ b/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
@@ -63,16 +63,8 @@ namespace MediaBrowser.Server.Implementations.Intros
                 ? null
                 : _localization.GetRatingLevel(item.OfficialRating);
 
-            var random = new Random(Environment.TickCount + Guid.NewGuid().GetHashCode());
-
             var candidates = new List<ItemWithTrailer>();
 
-            var itemPeople = _libraryManager.GetPeople(item);
-            var allPeople = _libraryManager.GetPeople(new InternalPeopleQuery
-            {
-                AppearsInItemId = item.Id
-            });
-
             var trailerTypes = new List<TrailerType>();
 
             if (config.EnableIntrosFromMoviesInLibrary)
@@ -105,26 +97,25 @@ namespace MediaBrowser.Server.Implementations.Intros
                 var trailerResult = _libraryManager.GetItemList(new InternalItemsQuery
                 {
                     IncludeItemTypes = new[] { typeof(Trailer).Name },
-                    TrailerTypes = trailerTypes.ToArray()
+                    TrailerTypes = trailerTypes.ToArray(),
+                    SimilarTo = item,
+                    IsPlayed = config.EnableIntrosForWatchedContent ? (bool?) null : false,
+                    MaxParentalRating = config.EnableIntrosParentalControl ? ratingLevel : null,
+                    Limit = config.TrailerLimit
                 });
 
                 candidates.AddRange(trailerResult.Select(i => new ItemWithTrailer
                 {
                     Item = i,
                     Type = i.SourceType == SourceType.Channel ? ItemWithTrailerType.ChannelTrailer : ItemWithTrailerType.ItemWithTrailer,
-                    User = user,
-                    WatchingItem = item,
-                    WatchingItemPeople = itemPeople,
-                    AllPeople = allPeople,
-                    Random = random,
                     LibraryManager = _libraryManager
                 }));
             } 
 
-            return GetResult(item, candidates, config, ratingLevel);
+            return GetResult(item, candidates, config);
         }
 
-        private IEnumerable<IntroInfo> GetResult(BaseItem item, IEnumerable<ItemWithTrailer> candidates, CinemaModeConfiguration config, int? ratingLevel)
+        private IEnumerable<IntroInfo> GetResult(BaseItem item, IEnumerable<ItemWithTrailer> candidates, CinemaModeConfiguration config)
         {
             var customIntros = !string.IsNullOrWhiteSpace(config.CustomIntroPath) ?
                 GetCustomIntros(config) :
@@ -134,48 +125,12 @@ namespace MediaBrowser.Server.Implementations.Intros
                 GetMediaInfoIntros(config, item) :
                 new List<IntroInfo>();
 
-            var trailerLimit = config.TrailerLimit;
-
             // Avoid implicitly captured closure
-            return candidates.Where(i =>
-            {
-                if (config.EnableIntrosParentalControl && !FilterByParentalRating(ratingLevel, i.Item))
-                {
-                    return false;
-                }
-
-                if (!config.EnableIntrosForWatchedContent && i.IsPlayed)
-                {
-                    return false;
-                }
-                return !IsDuplicate(item, i.Item);
-            })
-                .OrderByDescending(i => i.Score)
-                .ThenBy(i => Guid.NewGuid())
-                .ThenByDescending(i => i.IsPlayed ? 0 : 1)
-                .Select(i => i.IntroInfo)
-                .Take(trailerLimit)
+            return candidates.Select(i => i.IntroInfo)
                 .Concat(customIntros.Take(1))
                 .Concat(mediaInfoIntros);
         }
 
-        private bool IsDuplicate(BaseItem playingContent, BaseItem test)
-        {
-            var id = playingContent.GetProviderId(MetadataProviders.Imdb);
-            if (!string.IsNullOrWhiteSpace(id) && string.Equals(id, test.GetProviderId(MetadataProviders.Imdb), StringComparison.OrdinalIgnoreCase))
-            {
-                return true;
-            }
-
-            id = playingContent.GetProviderId(MetadataProviders.Tmdb);
-            if (!string.IsNullOrWhiteSpace(id) && string.Equals(id, test.GetProviderId(MetadataProviders.Tmdb), StringComparison.OrdinalIgnoreCase))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
         private CinemaModeConfiguration GetOptions()
         {
             return _serverConfig.GetConfiguration<CinemaModeConfiguration>("cinemamode");
@@ -346,102 +301,6 @@ namespace MediaBrowser.Server.Implementations.Intros
             return list.Distinct(StringComparer.OrdinalIgnoreCase);
         }
 
-        private bool FilterByParentalRating(int? ratingLevel, BaseItem item)
-        {
-            // Only content rated same or lower
-            if (ratingLevel.HasValue)
-            {
-                var level = string.IsNullOrWhiteSpace(item.OfficialRating)
-                    ? (int?)null
-                    : _localization.GetRatingLevel(item.OfficialRating);
-
-                return level.HasValue && level.Value <= ratingLevel.Value;
-            }
-
-            return true;
-        }
-
-        internal static int GetSimiliarityScore(BaseItem item1, List<PersonInfo> item1People, List<PersonInfo> allPeople, BaseItem item2, Random random, ILibraryManager libraryManager)
-        {
-            var points = 0;
-
-            if (!string.IsNullOrEmpty(item1.OfficialRating) && string.Equals(item1.OfficialRating, item2.OfficialRating, StringComparison.OrdinalIgnoreCase))
-            {
-                points += 10;
-            }
-
-            // Find common genres
-            points += item1.Genres.Where(i => item2.Genres.Contains(i, StringComparer.OrdinalIgnoreCase)).Sum(i => 10);
-
-            // Find common tags
-            points += GetTags(item1).Where(i => GetTags(item2).Contains(i, StringComparer.OrdinalIgnoreCase)).Sum(i => 10);
-
-            // Find common keywords
-            points += GetKeywords(item1).Where(i => GetKeywords(item2).Contains(i, StringComparer.OrdinalIgnoreCase)).Sum(i => 10);
-
-            // Find common studios
-            points += item1.Studios.Where(i => item2.Studios.Contains(i, StringComparer.OrdinalIgnoreCase)).Sum(i => 5);
-
-            var item2PeopleNames = allPeople.Where(i => i.ItemId == item2.Id)
-                .Select(i => i.Name)
-                .Where(i => !string.IsNullOrWhiteSpace(i))
-                .DistinctNames()
-                .ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
-
-            points += item1People.Where(i => item2PeopleNames.ContainsKey(i.Name)).Sum(i =>
-            {
-                if (string.Equals(i.Type, PersonType.Director, StringComparison.OrdinalIgnoreCase) || string.Equals(i.Role, PersonType.Director, StringComparison.OrdinalIgnoreCase))
-                {
-                    return 5;
-                }
-                if (string.Equals(i.Type, PersonType.Actor, StringComparison.OrdinalIgnoreCase) || string.Equals(i.Role, PersonType.Actor, StringComparison.OrdinalIgnoreCase))
-                {
-                    return 3;
-                }
-                if (string.Equals(i.Type, PersonType.Composer, StringComparison.OrdinalIgnoreCase) || string.Equals(i.Role, PersonType.Composer, StringComparison.OrdinalIgnoreCase))
-                {
-                    return 3;
-                }
-                if (string.Equals(i.Type, PersonType.GuestStar, StringComparison.OrdinalIgnoreCase) || string.Equals(i.Role, PersonType.GuestStar, StringComparison.OrdinalIgnoreCase))
-                {
-                    return 3;
-                }
-                if (string.Equals(i.Type, PersonType.Writer, StringComparison.OrdinalIgnoreCase) || string.Equals(i.Role, PersonType.Writer, StringComparison.OrdinalIgnoreCase))
-                {
-                    return 2;
-                }
-
-                return 1;
-            });
-
-            // Add some randomization so that you're not always seeing the same ones for a given movie
-            points += random.Next(0, 50);
-
-            return points;
-        }
-
-        private static IEnumerable<string> GetTags(BaseItem item)
-        {
-            var hasTags = item as IHasTags;
-            if (hasTags != null)
-            {
-                return hasTags.Tags;
-            }
-
-            return new List<string>();
-        }
-
-        private static IEnumerable<string> GetKeywords(BaseItem item)
-        {
-            var hasTags = item as IHasKeywords;
-            if (hasTags != null)
-            {
-                return hasTags.Keywords;
-            }
-
-            return new List<string>();
-        }
-
         public IEnumerable<string> GetAllIntroFiles()
         {
             return GetCustomIntroFiles(GetOptions(), true, true);
@@ -461,39 +320,8 @@ namespace MediaBrowser.Server.Implementations.Intros
         {
             internal BaseItem Item;
             internal ItemWithTrailerType Type;
-            internal User User;
-            internal BaseItem WatchingItem;
-            internal List<PersonInfo> WatchingItemPeople;
-            internal List<PersonInfo> AllPeople;
-            internal Random Random;
             internal ILibraryManager LibraryManager;
 
-            private bool? _isPlayed;
-            public bool IsPlayed
-            {
-                get
-                {
-                    if (!_isPlayed.HasValue)
-                    {
-                        _isPlayed = Item.IsPlayed(User);
-                    }
-                    return _isPlayed.Value;
-                }
-            }
-
-            private int? _score;
-            public int Score
-            {
-                get
-                {
-                    if (!_score.HasValue)
-                    {
-                        _score = GetSimiliarityScore(WatchingItem, WatchingItemPeople, AllPeople, Item, Random, LibraryManager);
-                    }
-                    return _score.Value;
-                }
-            }
-
             public IntroInfo IntroInfo
             {
                 get
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 56d3bd4de..4c0514035 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -33,6 +33,8 @@ using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using CommonIO;
+using MediaBrowser.Model.Channels;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.Library;
 using MediaBrowser.Model.Net;
@@ -362,6 +364,10 @@ namespace MediaBrowser.Server.Implementations.Library
                     return;
                 }
             }
+            if (item is Photo)
+            {
+                return;
+            }
             //if (!(item is Folder))
             //{
             //    return;
@@ -939,9 +945,7 @@ namespace MediaBrowser.Server.Implementations.Library
         private T CreateItemByName<T>(string path, string name)
             where T : BaseItem, new()
         {
-            var isArtist = typeof(T) == typeof(MusicArtist);
-
-            if (isArtist)
+            if (typeof(T) == typeof(MusicArtist))
             {
                 var existing = GetItemList(new InternalItemsQuery
                 {
@@ -1272,59 +1276,162 @@ namespace MediaBrowser.Server.Implementations.Library
             return item;
         }
 
-        public BaseItem GetMemoryItemById(Guid id)
+        public IEnumerable<BaseItem> GetItemList(InternalItemsQuery query)
         {
-            if (id == Guid.Empty)
+            if (query.Recursive && query.ParentId.HasValue)
             {
-                throw new ArgumentNullException("id");
+                var parent = GetItemById(query.ParentId.Value);
+                if (parent != null)
+                {
+                    SetTopParentIdsOrAncestors(query, new List<BaseItem> { parent });
+                    query.ParentId = null;
+                }
             }
 
-            BaseItem item;
+            if (query.User != null)
+            {
+                AddUserToQuery(query, query.User);
+            }
 
-            LibraryItemsCache.TryGetValue(id, out item);
+            return ItemRepository.GetItemList(query);
+        }
 
-            return item;
+        public IEnumerable<BaseItem> GetItemList(InternalItemsQuery query, IEnumerable<string> parentIds)
+        {
+            var parents = parentIds.Select(i => GetItemById(new Guid(i))).Where(i => i != null).ToList();
+
+            SetTopParentIdsOrAncestors(query, parents);
+
+            if (query.AncestorIds.Length == 0 && query.TopParentIds.Length == 0)
+            {
+                if (query.User != null)
+                {
+                    AddUserToQuery(query, query.User);
+                }
+            }
+
+            return ItemRepository.GetItemList(query);
         }
 
-        public IEnumerable<BaseItem> GetItemList(InternalItemsQuery query)
+        public QueryResult<BaseItem> QueryItems(InternalItemsQuery query)
         {
             if (query.User != null)
             {
                 AddUserToQuery(query, query.User);
             }
 
-            var result = ItemRepository.GetItemIdsList(query);
+            if (query.EnableTotalRecordCount)
+            {
+                return ItemRepository.GetItems(query);
+            }
 
-            return result.Select(GetItemById).Where(i => i != null);
+            return new QueryResult<BaseItem>
+            {
+                Items = ItemRepository.GetItemList(query).ToArray()
+            };
         }
 
-        public QueryResult<BaseItem> QueryItems(InternalItemsQuery query)
+        public List<Guid> GetItemIds(InternalItemsQuery query)
         {
             if (query.User != null)
             {
                 AddUserToQuery(query, query.User);
             }
 
-            return ItemRepository.GetItems(query);
+            return ItemRepository.GetItemIdsList(query);
         }
 
-        public List<Guid> GetItemIds(InternalItemsQuery query)
+        public QueryResult<Tuple<BaseItem, ItemCounts>> GetStudios(InternalItemsQuery query)
         {
             if (query.User != null)
             {
                 AddUserToQuery(query, query.User);
             }
 
-            return ItemRepository.GetItemIdsList(query);
+            SetTopParentOrAncestorIds(query);
+            return ItemRepository.GetStudios(query);
         }
 
-        public IEnumerable<BaseItem> GetItemList(InternalItemsQuery query, IEnumerable<string> parentIds)
+        public QueryResult<Tuple<BaseItem, ItemCounts>> GetGenres(InternalItemsQuery query)
         {
-            var parents = parentIds.Select(i => GetItemById(new Guid(i))).Where(i => i != null).ToList();
+            if (query.User != null)
+            {
+                AddUserToQuery(query, query.User);
+            }
 
-            SetTopParentIdsOrAncestors(query, parents);
+            SetTopParentOrAncestorIds(query);
+            return ItemRepository.GetGenres(query);
+        }
+
+        public QueryResult<Tuple<BaseItem, ItemCounts>> GetGameGenres(InternalItemsQuery query)
+        {
+            if (query.User != null)
+            {
+                AddUserToQuery(query, query.User);
+            }
+
+            SetTopParentOrAncestorIds(query);
+            return ItemRepository.GetGameGenres(query);
+        }
+
+        public QueryResult<Tuple<BaseItem, ItemCounts>> GetMusicGenres(InternalItemsQuery query)
+        {
+            if (query.User != null)
+            {
+                AddUserToQuery(query, query.User);
+            }
+
+            SetTopParentOrAncestorIds(query);
+            return ItemRepository.GetMusicGenres(query);
+        }
+
+        public QueryResult<Tuple<BaseItem, ItemCounts>> GetArtists(InternalItemsQuery query)
+        {
+            if (query.User != null)
+            {
+                AddUserToQuery(query, query.User);
+            }
+
+            SetTopParentOrAncestorIds(query);
+            return ItemRepository.GetArtists(query);
+        }
+
+        private void SetTopParentOrAncestorIds(InternalItemsQuery query)
+        {
+            if (query.AncestorIds.Length == 0)
+            {
+                return;
+            }
+
+            var parents = query.AncestorIds.Select(i => GetItemById(new Guid(i))).ToList();
+
+            if (parents.All(i =>
+            {
+                if (i is ICollectionFolder || i is UserView)
+                {
+                    return true;
+                }
+
+                //_logger.Debug("Query requires ancestor query due to type: " + i.GetType().Name);
+                return false;
+
+            }))
+            {
+                // Optimize by querying against top level views
+                query.TopParentIds = parents.SelectMany(i => GetTopParentsForQuery(i, query.User)).Select(i => i.Id.ToString("N")).ToArray();
+                query.AncestorIds = new string[] { };
+            }
+        }
 
-            return GetItemIds(query).Select(GetItemById).Where(i => i != null);
+        public QueryResult<Tuple<BaseItem, ItemCounts>> GetAlbumArtists(InternalItemsQuery query)
+        {
+            if (query.User != null)
+            {
+                AddUserToQuery(query, query.User);
+            }
+
+            SetTopParentOrAncestorIds(query);
+            return ItemRepository.GetAlbumArtists(query);
         }
 
         public QueryResult<BaseItem> GetItemsResult(InternalItemsQuery query)
@@ -1346,30 +1453,15 @@ namespace MediaBrowser.Server.Implementations.Library
 
             if (query.EnableTotalRecordCount)
             {
-                var initialResult = ItemRepository.GetItemIds(query);
-
-                return new QueryResult<BaseItem>
-                {
-                    TotalRecordCount = initialResult.TotalRecordCount,
-                    Items = initialResult.Items.Select(GetItemById).Where(i => i != null).ToArray()
-                };
+                return ItemRepository.GetItems(query);
             }
 
             return new QueryResult<BaseItem>
             {
-                Items = ItemRepository.GetItemIdsList(query).Select(GetItemById).Where(i => i != null).ToArray()
+                Items = ItemRepository.GetItemList(query).ToArray()
             };
         }
 
-        public QueryResult<BaseItem> GetItemsResult(InternalItemsQuery query, IEnumerable<string> parentIds)
-        {
-            var parents = parentIds.Select(i => GetItemById(new Guid(i))).Where(i => i != null).ToList();
-
-            SetTopParentIdsOrAncestors(query, parents);
-
-            return GetItemsResult(query);
-        }
-
         private void SetTopParentIdsOrAncestors(InternalItemsQuery query, List<BaseItem> parents)
         {
             if (parents.All(i =>
@@ -1379,7 +1471,7 @@ namespace MediaBrowser.Server.Implementations.Library
                     return true;
                 }
 
-                _logger.Debug("Query requires ancestor query due to type: " + i.GetType().Name);
+                //_logger.Debug("Query requires ancestor query due to type: " + i.GetType().Name);
                 return false;
 
             }))
@@ -1421,8 +1513,13 @@ namespace MediaBrowser.Server.Implementations.Library
                 }
                 if (string.Equals(view.ViewType, CollectionType.Channels))
                 {
-                    // TODO: Return channels
-                    return new[] { view };
+                    var channelResult = BaseItem.ChannelManager.GetChannelsInternal(new ChannelQuery
+                    {
+                        UserId = user.Id.ToString("N")
+
+                    }, CancellationToken.None).Result;
+                    
+                    return channelResult.Items;
                 }
 
                 // Translate view into folders
@@ -2309,7 +2406,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
         public IEnumerable<Video> FindTrailers(BaseItem owner, List<FileSystemMetadata> fileSystemChildren, IDirectoryService directoryService)
         {
-            var files = fileSystemChildren.Where(i => i.IsDirectory)
+            var files = owner.IsInMixedFolder ? new List<FileSystemMetadata>() : fileSystemChildren.Where(i => i.IsDirectory)
                 .Where(i => string.Equals(i.Name, BaseItem.TrailerFolderName, StringComparison.OrdinalIgnoreCase))
                 .SelectMany(i => _fileSystem.GetFiles(i.FullName, false))
                 .ToList();
@@ -2709,6 +2806,31 @@ namespace MediaBrowser.Server.Implementations.Library
             }
 
             _fileSystem.CreateShortcut(lnk, path);
+
+            RemoveContentTypeOverrides(path);
+        }
+
+        private void RemoveContentTypeOverrides(string path)
+        {
+            var removeList = new List<NameValuePair>();
+
+            foreach (var contentType in ConfigurationManager.Configuration.ContentTypes)
+            {
+                if (string.Equals(path, contentType.Name, StringComparison.OrdinalIgnoreCase)
+                    || _fileSystem.ContainsSubPath(path, contentType.Name))
+                {
+                    removeList.Add(contentType);
+                }
+            }
+
+            if (removeList.Count > 0)
+            {
+                ConfigurationManager.Configuration.ContentTypes = ConfigurationManager.Configuration.ContentTypes
+                    .Except(removeList)
+                        .ToArray();
+
+                ConfigurationManager.SaveConfiguration();
+            }
         }
 
         public void RemoveMediaPath(string virtualFolderName, string mediaPath)
diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
index 0ef7efe1b..4f3fe1bf3 100644
--- a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
@@ -69,10 +69,6 @@ namespace MediaBrowser.Server.Implementations.Library
 
             if (stream.IsTextSubtitleStream)
             {
-                if (string.Equals(stream.Codec, "ass", StringComparison.OrdinalIgnoreCase))
-                {
-                    return false;
-                }
                 return true;
             }
 
diff --git a/MediaBrowser.Server.Implementations/Library/MusicManager.cs b/MediaBrowser.Server.Implementations/Library/MusicManager.cs
index ef13ba996..3ff434898 100644
--- a/MediaBrowser.Server.Implementations/Library/MusicManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MusicManager.cs
@@ -98,7 +98,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
                 Genres = genreList.ToArray()
 
-            }, new string[] { });
+            });
 
             var genresDictionary = genreList.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
 
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
index 9edd3f83f..703a33856 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
@@ -126,7 +126,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
             }
             else
             {
-                var videoInfo = parser.ResolveFile(args.Path);
+                var videoInfo = parser.Resolve(args.Path, false, false);
 
                 if (videoInfo == null)
                 {
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
index e62049821..14e5e446b 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
@@ -1,6 +1,9 @@
-using MediaBrowser.Controller.Entities.TV;
+using System;
+using System.IO;
+using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using System.Linq;
+using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
 {
@@ -37,7 +40,8 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
             }
 
             // If the parent is a Season or Series, then this is an Episode if the VideoResolver returns something
-            if (season != null || args.HasParent<Series>())
+            // Also handle flat tv folders
+            if (season != null || args.HasParent<Series>() || string.Equals(args.GetCollectionType(), CollectionType.TvShows, StringComparison.OrdinalIgnoreCase))
             {
                 var episode = ResolveVideo<Episode>(args, false);
 
diff --git a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
index e271fbcb2..cf6f070d0 100644
--- a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
+++ b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
@@ -122,7 +122,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 AddIfMissing(excludeItemTypes, typeof(MusicGenre).Name);
             }
 
-            if (query.IncludePeople && (includeItemTypes.Count == 0 || includeItemTypes.Contains("People", StringComparer.OrdinalIgnoreCase)))
+            if (query.IncludePeople && (includeItemTypes.Count == 0 || includeItemTypes.Contains("People", StringComparer.OrdinalIgnoreCase) || includeItemTypes.Contains("Person", StringComparer.OrdinalIgnoreCase)))
             {
                 if (!query.IncludeMedia)
                 {
@@ -168,7 +168,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 Limit = query.Limit,
                 IncludeItemsByName = true
 
-            }, new string[] { });
+            });
 
             // Add search hints based on item name
             hints.AddRange(mediaItems.Where(IncludeInSearch).Select(item =>
diff --git a/MediaBrowser.Server.Implementations/Library/UserDataManager.cs b/MediaBrowser.Server.Implementations/Library/UserDataManager.cs
index 0e211937f..715f3c522 100644
--- a/MediaBrowser.Server.Implementations/Library/UserDataManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserDataManager.cs
@@ -23,7 +23,8 @@ namespace MediaBrowser.Server.Implementations.Library
     {
         public event EventHandler<UserDataSaveEventArgs> UserDataSaved;
 
-        private readonly Dictionary<string, UserItemData> _userData = new Dictionary<string, UserItemData>(StringComparer.OrdinalIgnoreCase);
+        private readonly ConcurrentDictionary<string, UserItemData> _userData =
+            new ConcurrentDictionary<string, UserItemData>(StringComparer.OrdinalIgnoreCase);
 
         private readonly ILogger _logger;
         private readonly IServerConfigurationManager _config;
@@ -64,13 +65,6 @@ namespace MediaBrowser.Server.Implementations.Library
                 try
                 {
                     await Repository.SaveUserData(userId, key, userData, cancellationToken).ConfigureAwait(false);
-
-                    var newValue = userData;
-
-                    lock (_userData)
-                    {
-                        _userData[GetCacheKey(userId, key)] = newValue;
-                    }
                 }
                 catch (Exception ex)
                 {
@@ -80,6 +74,9 @@ namespace MediaBrowser.Server.Implementations.Library
                 }
             }
 
+            var cacheKey = GetCacheKey(userId, item.Id);
+            _userData.AddOrUpdate(cacheKey, userData, (k, v) => userData);
+
             EventHelper.FireEventIfNotNull(UserDataSaved, this, new UserDataSaveEventArgs
             {
                 Keys = keys,
@@ -122,7 +119,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
                 throw;
             }
-            
+
         }
 
         /// <summary>
@@ -140,7 +137,7 @@ namespace MediaBrowser.Server.Implementations.Library
             return Repository.GetAllUserData(userId);
         }
 
-        public UserItemData GetUserData(Guid userId, List<string> keys)
+        public UserItemData GetUserData(Guid userId, Guid itemId, List<string> keys)
         {
             if (userId == Guid.Empty)
             {
@@ -150,95 +147,44 @@ namespace MediaBrowser.Server.Implementations.Library
             {
                 throw new ArgumentNullException("keys");
             }
-
-            lock (_userData)
+            if (keys.Count == 0)
             {
-                foreach (var key in keys)
-                {
-                    var cacheKey = GetCacheKey(userId, key);
-                    UserItemData value;
-                    if (_userData.TryGetValue(cacheKey, out value))
-                    {
-                        return value;
-                    }
-
-                    value = Repository.GetUserData(userId, key);
-
-                    if (value != null)
-                    {
-                        _userData[cacheKey] = value;
-                        return value;
-                    }
-                }
+                throw new ArgumentException("UserData keys cannot be empty.");
+            }
 
-                if (keys.Count > 0)
-                {
-                    var key = keys[0];
-                    var cacheKey = GetCacheKey(userId, key);
-                    var userdata = new UserItemData
-                    {
-                        UserId = userId,
-                        Key = key
-                    };
-                    _userData[cacheKey] = userdata;
-                    return userdata;
-                }
+            var cacheKey = GetCacheKey(userId, itemId);
 
-                return null;
-            }
+            return _userData.GetOrAdd(cacheKey, k => GetUserDataInternal(userId, keys));
         }
 
-        /// <summary>
-        /// Gets the user data.
-        /// </summary>
-        /// <param name="userId">The user id.</param>
-        /// <param name="key">The key.</param>
-        /// <returns>Task{UserItemData}.</returns>
-        public UserItemData GetUserData(Guid userId, string key)
+        private UserItemData GetUserDataInternal(Guid userId, List<string> keys)
         {
-            if (userId == Guid.Empty)
-            {
-                throw new ArgumentNullException("userId");
-            }
-            if (string.IsNullOrEmpty(key))
+            var userData = Repository.GetUserData(userId, keys);
+
+            if (userData != null)
             {
-                throw new ArgumentNullException("key");
+                return userData;
             }
 
-            lock (_userData)
+            if (keys.Count > 0)
             {
-                var cacheKey = GetCacheKey(userId, key);
-                UserItemData value;
-                if (_userData.TryGetValue(cacheKey, out value))
-                {
-                    return value;
-                }
-
-                value = Repository.GetUserData(userId, key);
-
-                if (value == null)
+                return new UserItemData
                 {
-                    value = new UserItemData
-                    {
-                        UserId = userId,
-                        Key = key
-                    };
-                }
-
-                _userData[cacheKey] = value;
-                return value;
+                    UserId = userId,
+                    Key = keys[0]
+                };
             }
+
+            return null;
         }
 
         /// <summary>
         /// Gets the internal key.
         /// </summary>
-        /// <param name="userId">The user id.</param>
-        /// <param name="key">The key.</param>
         /// <returns>System.String.</returns>
-        private string GetCacheKey(Guid userId, string key)
+        private string GetCacheKey(Guid userId, Guid itemId)
         {
-            return userId + key;
+            return userId.ToString("N") + itemId.ToString("N");
         }
 
         public UserItemData GetUserData(IHasUserData user, IHasUserData item)
@@ -253,16 +199,24 @@ namespace MediaBrowser.Server.Implementations.Library
 
         public UserItemData GetUserData(Guid userId, IHasUserData item)
         {
-            return GetUserData(userId, item.GetUserDataKeys());
+            return GetUserData(userId, item.Id, item.GetUserDataKeys());
         }
 
-        public UserItemDataDto GetUserDataDto(IHasUserData item, User user)
+        public async Task<UserItemDataDto> GetUserDataDto(IHasUserData item, User user)
         {
             var userData = GetUserData(user.Id, item);
             var dto = GetUserItemDataDto(userData);
 
-            item.FillUserDataDtoValues(dto, userData, user);
+            await item.FillUserDataDtoValues(dto, userData, null, user).ConfigureAwait(false);
+            return dto;
+        }
+
+        public async Task<UserItemDataDto> GetUserDataDto(IHasUserData item, BaseItemDto itemDto, User user)
+        {
+            var userData = GetUserData(user.Id, item);
+            var dto = GetUserItemDataDto(userData);
 
+            await item.FillUserDataDtoValues(dto, userData, itemDto, user).ConfigureAwait(false);
             return dto;
         }
 
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index 5ba83d6c7..6456d7f81 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -729,7 +729,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
             var text = new StringBuilder();
 
-            var localAddress = _appHost.LocalApiUrl ?? string.Empty;
+            var localAddress = _appHost.GetLocalApiUrl().Result ?? string.Empty;
 
             text.AppendLine("Use your web browser to visit:");
             text.AppendLine(string.Empty);
diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
index 1bba20ec5..319e715c3 100644
--- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
@@ -105,7 +105,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 }
             }
 
-            if (user.Configuration.DisplayFoldersView)
+            if (_config.Configuration.EnableFolderView)
             {
                 var name = _localizationManager.GetLocalizedString("ViewType" + CollectionType.Folders);
                 list.Add(await _libraryManager.GetNamedView(name, CollectionType.Folders, string.Empty, cancellationToken).ConfigureAwait(false));
@@ -202,23 +202,7 @@ namespace MediaBrowser.Server.Implementations.Library
         {
             var user = _userManager.GetUserById(request.UserId);
 
-            var includeTypes = request.IncludeItemTypes;
-
-            var currentUser = user;
-
-            var libraryItems = GetItemsForLatestItems(user, request.ParentId, includeTypes, request.Limit ?? 10).Where(i =>
-            {
-                if (request.IsPlayed.HasValue)
-                {
-                    var val = request.IsPlayed.Value;
-                    if (i is Video && i.IsPlayed(currentUser) != val)
-                    {
-                        return false;
-                    }
-                }
-
-                return true;
-            });
+            var libraryItems = GetItemsForLatestItems(user, request);
 
             var list = new List<Tuple<BaseItem, List<BaseItem>>>();
 
@@ -254,8 +238,13 @@ namespace MediaBrowser.Server.Implementations.Library
             return list;
         }
 
-        private IEnumerable<BaseItem> GetItemsForLatestItems(User user, string parentId, string[] includeItemTypes, int limit)
+        private IEnumerable<BaseItem> GetItemsForLatestItems(User user, LatestItemsQuery request)
         {
+            var parentId = request.ParentId;
+
+            var includeItemTypes = request.IncludeItemTypes;
+            var limit = request.Limit ?? 10;
+
             var parentIds = string.IsNullOrEmpty(parentId)
               ? new string[] { }
               : new[] { parentId };
@@ -276,7 +265,12 @@ namespace MediaBrowser.Server.Implementations.Library
 
             var excludeItemTypes = includeItemTypes.Length == 0 ? new[]
             {
-                typeof(Person).Name, typeof(Studio).Name, typeof(Year).Name, typeof(GameGenre).Name, typeof(MusicGenre).Name, typeof(Genre).Name
+                typeof(Person).Name,
+                typeof(Studio).Name,
+                typeof(Year).Name,
+                typeof(GameGenre).Name,
+                typeof(MusicGenre).Name,
+                typeof(Genre).Name
 
             } : new string[] { };
 
@@ -288,8 +282,9 @@ namespace MediaBrowser.Server.Implementations.Library
                 IsFolder = includeItemTypes.Length == 0 ? false : (bool?)null,
                 ExcludeItemTypes = excludeItemTypes,
                 ExcludeLocationTypes = new[] { LocationType.Virtual },
-                Limit = limit * 20,
-                ExcludeSourceTypes = parentIds.Length == 0 ? new[] { SourceType.Channel, SourceType.LiveTV } : new SourceType[] { }
+                Limit = limit * 5,
+                ExcludeSourceTypes = parentIds.Length == 0 ? new[] { SourceType.Channel, SourceType.LiveTV } : new SourceType[] { },
+                IsPlayed = request.IsPlayed
 
             }, parentIds);
         }
diff --git a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs
index dccc7aa93..23560b1aa 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs
@@ -41,7 +41,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             var service = _liveTvManager.Services.FirstOrDefault(i => string.Equals(i.Name, liveTvItem.ServiceName, StringComparison.OrdinalIgnoreCase));
 
-            if (service != null)
+            if (service != null && !item.HasImage(ImageType.Primary))
             {
                 try
                 {
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index de75aac9c..8f56554f1 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -35,7 +35,7 @@ using Microsoft.Win32;
 
 namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
 {
-    public class EmbyTV : ILiveTvService, IHasRegistrationInfo, IDisposable
+    public class EmbyTV : ILiveTvService, ISupportsNewTimerIds, IHasRegistrationInfo, IDisposable
     {
         private readonly IApplicationHost _appHpst;
         private readonly ILogger _logger;
@@ -102,7 +102,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             _timerProvider.RestartTimers();
 
             SystemEvents.PowerModeChanged += SystemEvents_PowerModeChanged;
-
             CreateRecordingFolders();
         }
 
@@ -111,7 +110,19 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             CreateRecordingFolders();
         }
 
-        private void CreateRecordingFolders()
+        internal void CreateRecordingFolders()
+        {
+            try
+            {
+                CreateRecordingFoldersInternal();
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error creating recording folders", ex);
+            }
+        }
+
+        internal void CreateRecordingFoldersInternal()
         {
             var recordingFolders = GetRecordingFolders();
 
@@ -371,6 +382,29 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             return list;
         }
 
+        public async Task<List<ChannelInfo>> GetChannelsForListingsProvider(ListingsProviderInfo listingsProvider, CancellationToken cancellationToken)
+        {
+            var list = new List<ChannelInfo>();
+
+            foreach (var hostInstance in _liveTvManager.TunerHosts)
+            {
+                try
+                {
+                    var channels = await hostInstance.GetChannels(cancellationToken).ConfigureAwait(false);
+
+                    list.AddRange(channels);
+                }
+                catch (Exception ex)
+                {
+                    _logger.ErrorException("Error getting channels", ex);
+                }
+            }
+
+            return list
+                .Where(i => IsListingProviderEnabledForTuner(listingsProvider, i.TunerHostId))
+                .ToList();
+        }
+
         public Task<IEnumerable<ChannelInfo>> GetChannelsAsync(CancellationToken cancellationToken)
         {
             return GetChannelsAsync(false, cancellationToken);
@@ -424,12 +458,22 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
 
         public Task CreateTimerAsync(TimerInfo info, CancellationToken cancellationToken)
         {
+            return CreateTimer(info, cancellationToken);
+        }
+
+        public Task CreateSeriesTimerAsync(SeriesTimerInfo info, CancellationToken cancellationToken)
+        {
+            return CreateSeriesTimer(info, cancellationToken);
+        }
+
+        public Task<string> CreateTimer(TimerInfo info, CancellationToken cancellationToken)
+        {
             info.Id = Guid.NewGuid().ToString("N");
             _timerProvider.Add(info);
-            return Task.FromResult(0);
+            return Task.FromResult(info.Id);
         }
 
-        public async Task CreateSeriesTimerAsync(SeriesTimerInfo info, CancellationToken cancellationToken)
+        public async Task<string> CreateSeriesTimer(SeriesTimerInfo info, CancellationToken cancellationToken)
         {
             info.Id = Guid.NewGuid().ToString("N");
 
@@ -459,6 +503,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
 
             _seriesTimerProvider.Add(info);
             await UpdateTimersForSeriesTimer(epgData, info, false).ConfigureAwait(false);
+
+            return info.Id;
         }
 
         public async Task UpdateSeriesTimerAsync(SeriesTimerInfo info, CancellationToken cancellationToken)
@@ -537,9 +583,20 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             {
                 PostPaddingSeconds = Math.Max(config.PostPaddingSeconds, 0),
                 PrePaddingSeconds = Math.Max(config.PrePaddingSeconds, 0),
-                RecordAnyChannel = false,
-                RecordAnyTime = false,
-                RecordNewOnly = false
+                RecordAnyChannel = true,
+                RecordAnyTime = true,
+                RecordNewOnly = false,
+
+                Days = new List<DayOfWeek>
+                {
+                    DayOfWeek.Sunday,
+                    DayOfWeek.Monday,
+                    DayOfWeek.Tuesday,
+                    DayOfWeek.Wednesday,
+                    DayOfWeek.Thursday,
+                    DayOfWeek.Friday,
+                    DayOfWeek.Saturday
+                }
             };
 
             if (program != null)
@@ -603,7 +660,16 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
 
                 _logger.Debug("Getting programs for channel {0}-{1} from {2}-{3}", channel.Number, channel.Name, provider.Item1.Name, provider.Item2.ListingsId ?? string.Empty);
 
-                var programs = await provider.Item1.GetProgramsAsync(provider.Item2, channel.Number, channel.Name, startDateUtc, endDateUtc, cancellationToken)
+                var channelMappings = GetChannelMappings(provider.Item2);
+                var channelNumber = channel.Number;
+                string mappedChannelNumber;
+                if (channelMappings.TryGetValue(channelNumber, out mappedChannelNumber))
+                {
+                    _logger.Debug("Found mapped channel on provider {0}. Tuner channel number: {1}, Mapped channel number: {2}", provider.Item1.Name, channelNumber, mappedChannelNumber);
+                    channelNumber = mappedChannelNumber;
+                }
+
+                var programs = await provider.Item1.GetProgramsAsync(provider.Item2, channelNumber, channel.Name, startDateUtc, endDateUtc, cancellationToken)
                         .ConfigureAwait(false);
 
                 var list = programs.ToList();
@@ -625,6 +691,18 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             return new List<ProgramInfo>();
         }
 
+        private Dictionary<string, string> GetChannelMappings(ListingsProviderInfo info)
+        {
+            var dict = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+
+            foreach (var mapping in info.ChannelMappings)
+            {
+                dict[mapping.Name] = mapping.Value;
+            }
+
+            return dict;
+        }
+
         private List<Tuple<IListingsProvider, ListingsProviderInfo>> GetListingProviders()
         {
             return GetConfiguration().ListingProviders
@@ -901,64 +979,57 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
 
             var recordPath = GetRecordingPath(timer, info);
             var recordingStatus = RecordingStatus.New;
+            var isResourceOpen = false;
+            SemaphoreSlim semaphore = null;
 
             try
             {
                 var result = await GetChannelStreamInternal(timer.ChannelId, null, CancellationToken.None).ConfigureAwait(false);
+                isResourceOpen = true;
+                semaphore = result.Item3;
                 var mediaStreamInfo = result.Item1;
-                var isResourceOpen = true;
 
-                // Unfortunately due to the semaphore we have to have a nested try/finally
-                try
-                {
-                    // HDHR doesn't seem to release the tuner right away after first probing with ffmpeg
-                    //await Task.Delay(3000, cancellationToken).ConfigureAwait(false);
+                // HDHR doesn't seem to release the tuner right away after first probing with ffmpeg
+                //await Task.Delay(3000, cancellationToken).ConfigureAwait(false);
 
-                    var recorder = await GetRecorder().ConfigureAwait(false);
+                var recorder = await GetRecorder().ConfigureAwait(false);
 
-                    recordPath = recorder.GetOutputPath(mediaStreamInfo, recordPath);
-                    recordPath = EnsureFileUnique(recordPath, timer.Id);
-                    _fileSystem.CreateDirectory(Path.GetDirectoryName(recordPath));
-                    activeRecordingInfo.Path = recordPath;
+                recordPath = recorder.GetOutputPath(mediaStreamInfo, recordPath);
+                recordPath = EnsureFileUnique(recordPath, timer.Id);
 
-                    _libraryMonitor.ReportFileSystemChangeBeginning(recordPath);
+                _libraryMonitor.ReportFileSystemChangeBeginning(recordPath);
+                _fileSystem.CreateDirectory(Path.GetDirectoryName(recordPath));
+                activeRecordingInfo.Path = recordPath;
 
-                    var duration = recordingEndDate - DateTime.UtcNow;
+                var duration = recordingEndDate - DateTime.UtcNow;
 
-                    _logger.Info("Beginning recording. Will record for {0} minutes.", duration.TotalMinutes.ToString(CultureInfo.InvariantCulture));
+                _logger.Info("Beginning recording. Will record for {0} minutes.", duration.TotalMinutes.ToString(CultureInfo.InvariantCulture));
 
-                    _logger.Info("Writing file to path: " + recordPath);
-                    _logger.Info("Opening recording stream from tuner provider");
+                _logger.Info("Writing file to path: " + recordPath);
+                _logger.Info("Opening recording stream from tuner provider");
 
-                    Action onStarted = () =>
-                    {
-                        result.Item3.Release();
-                        isResourceOpen = false;
-                    };
-
-                    var pathWithDuration = result.Item2.ApplyDuration(mediaStreamInfo.Path, duration);
+                Action onStarted = () =>
+                {
+                    timer.Status = RecordingStatus.InProgress;
+                    _timerProvider.AddOrUpdate(timer, false);
 
-                    // If it supports supplying duration via url
-                    if (!string.Equals(pathWithDuration, mediaStreamInfo.Path, StringComparison.OrdinalIgnoreCase))
-                    {
-                        mediaStreamInfo.Path = pathWithDuration;
-                        mediaStreamInfo.RunTimeTicks = duration.Ticks;
-                    }
+                    result.Item3.Release();
+                    isResourceOpen = false;
+                };
 
-                    await recorder.Record(mediaStreamInfo, recordPath, duration, onStarted, cancellationToken).ConfigureAwait(false);
+                var pathWithDuration = result.Item2.ApplyDuration(mediaStreamInfo.Path, duration);
 
-                    recordingStatus = RecordingStatus.Completed;
-                    _logger.Info("Recording completed: {0}", recordPath);
-                }
-                finally
+                // If it supports supplying duration via url
+                if (!string.Equals(pathWithDuration, mediaStreamInfo.Path, StringComparison.OrdinalIgnoreCase))
                 {
-                    if (isResourceOpen)
-                    {
-                        result.Item3.Release();
-                    }
-
-                    _libraryMonitor.ReportFileSystemChangeComplete(recordPath, false);
+                    mediaStreamInfo.Path = pathWithDuration;
+                    mediaStreamInfo.RunTimeTicks = duration.Ticks;
                 }
+
+                await recorder.Record(mediaStreamInfo, recordPath, duration, onStarted, cancellationToken).ConfigureAwait(false);
+
+                recordingStatus = RecordingStatus.Completed;
+                _logger.Info("Recording completed: {0}", recordPath);
             }
             catch (OperationCanceledException)
             {
@@ -972,21 +1043,32 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             }
             finally
             {
+                if (isResourceOpen && semaphore != null)
+                {
+                    semaphore.Release();
+                }
+
+                _libraryMonitor.ReportFileSystemChangeComplete(recordPath, true);
+
                 ActiveRecordingInfo removed;
                 _activeRecordings.TryRemove(timer.Id, out removed);
             }
 
             if (recordingStatus == RecordingStatus.Completed)
             {
-                OnSuccessfulRecording(info.IsSeries, recordPath);
+                timer.Status = RecordingStatus.Completed;
                 _timerProvider.Delete(timer);
+
+                OnSuccessfulRecording(info.IsSeries, recordPath);
             }
             else if (DateTime.UtcNow < timer.EndDate)
             {
                 const int retryIntervalSeconds = 60;
                 _logger.Info("Retrying recording in {0} seconds.", retryIntervalSeconds);
 
-                _timerProvider.StartTimer(timer, TimeSpan.FromSeconds(retryIntervalSeconds));
+                timer.Status = RecordingStatus.New;
+                timer.StartDate = DateTime.UtcNow.AddSeconds(retryIntervalSeconds);
+                _timerProvider.AddOrUpdate(timer);
             }
             else
             {
@@ -1038,7 +1120,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
 
                 if (regInfo.IsValid)
                 {
-                    return new EncodedRecorder(_logger, _fileSystem, _mediaEncoder, _config.ApplicationPaths, _jsonSerializer, config);
+                    return new EncodedRecorder(_logger, _fileSystem, _mediaEncoder, _config.ApplicationPaths, _jsonSerializer, config, _httpClient);
                 }
             }
 
@@ -1204,6 +1286,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             if (!seriesTimer.RecordAnyTime)
             {
                 allPrograms = allPrograms.Where(epg => Math.Abs(seriesTimer.StartDate.TimeOfDay.Ticks - epg.StartDate.TimeOfDay.Ticks) < TimeSpan.FromMinutes(5).Ticks);
+
+                allPrograms = allPrograms.Where(i => seriesTimer.Days.Contains(i.StartDate.ToLocalTime().DayOfWeek));
             }
 
             if (seriesTimer.RecordNewOnly)
@@ -1216,8 +1300,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
                 allPrograms = allPrograms.Where(epg => string.Equals(epg.ChannelId, seriesTimer.ChannelId, StringComparison.OrdinalIgnoreCase));
             }
 
-            allPrograms = allPrograms.Where(i => seriesTimer.Days.Contains(i.StartDate.ToLocalTime().DayOfWeek));
-
             if (string.IsNullOrWhiteSpace(seriesTimer.SeriesId))
             {
                 _logger.Error("seriesTimer.SeriesId is null. Cannot find programs for series");
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTVRegistration.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTVRegistration.cs
new file mode 100644
index 000000000..675fca325
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTVRegistration.cs
@@ -0,0 +1,36 @@
+using System.Threading.Tasks;
+using MediaBrowser.Common.Security;
+
+namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
+{
+    public class EmbyTVRegistration : IRequiresRegistration
+    {
+        private readonly ISecurityManager _securityManager;
+
+        public static EmbyTVRegistration Instance;
+
+        public EmbyTVRegistration(ISecurityManager securityManager)
+        {
+            _securityManager = securityManager;
+            Instance = this;
+        }
+
+        private bool? _isXmlTvEnabled;
+
+        public Task LoadRegistrationInfoAsync()
+        {
+            _isXmlTvEnabled = null;
+            return Task.FromResult(true);
+        }
+
+        public async Task<bool> EnableXmlTv()
+        {
+            if (!_isXmlTvEnabled.HasValue)
+            {
+                var info = await _securityManager.GetRegistrationStatus("xmltv").ConfigureAwait(false);
+                _isXmlTvEnabled = info.IsValid;
+            }
+            return _isXmlTvEnabled.Value;
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
index e9ea49fa3..21879f6f4 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
@@ -8,7 +8,9 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using CommonIO;
-using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.IO;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
@@ -22,8 +24,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
     {
         private readonly ILogger _logger;
         private readonly IFileSystem _fileSystem;
+        private readonly IHttpClient _httpClient;
         private readonly IMediaEncoder _mediaEncoder;
-        private readonly IApplicationPaths _appPaths;
+        private readonly IServerApplicationPaths _appPaths;
         private readonly LiveTvOptions _liveTvOptions;
         private bool _hasExited;
         private Stream _logFileStream;
@@ -32,7 +35,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
         private readonly IJsonSerializer _json;
         private readonly TaskCompletionSource<bool> _taskCompletionSource = new TaskCompletionSource<bool>();
 
-        public EncodedRecorder(ILogger logger, IFileSystem fileSystem, IMediaEncoder mediaEncoder, IApplicationPaths appPaths, IJsonSerializer json, LiveTvOptions liveTvOptions)
+        public EncodedRecorder(ILogger logger, IFileSystem fileSystem, IMediaEncoder mediaEncoder, IServerApplicationPaths appPaths, IJsonSerializer json, LiveTvOptions liveTvOptions, IHttpClient httpClient)
         {
             _logger = logger;
             _fileSystem = fileSystem;
@@ -40,39 +43,91 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             _appPaths = appPaths;
             _json = json;
             _liveTvOptions = liveTvOptions;
+            _httpClient = httpClient;
         }
 
         public string GetOutputPath(MediaSourceInfo mediaSource, string targetFile)
         {
-            if (_liveTvOptions.EnableOriginalAudioWithEncodedRecordings)
+            return Path.ChangeExtension(targetFile, ".mp4");
+        }
+
+        public async Task Record(MediaSourceInfo mediaSource, string targetFile, TimeSpan duration, Action onStarted, CancellationToken cancellationToken)
+        {
+            var tempfile = Path.Combine(_appPaths.TranscodingTempPath, Guid.NewGuid().ToString("N") + ".ts");
+
+            try
+            {
+                await RecordInternal(mediaSource, tempfile, targetFile, duration, onStarted, cancellationToken)
+                        .ConfigureAwait(false);
+            }
+            finally
             {
-                // if the audio is aac_latm, stream copying to mp4 will fail
-                var streams = mediaSource.MediaStreams ?? new List<MediaStream>();
-                if (streams.Any(i => i.Type == MediaStreamType.Audio && (i.Codec ?? string.Empty).IndexOf("aac", StringComparison.OrdinalIgnoreCase) != -1))
+                try
+                {
+                    File.Delete(tempfile);
+                }
+                catch (Exception ex)
                 {
-                    return Path.ChangeExtension(targetFile, ".mkv");
+                    _logger.ErrorException("Error deleting recording temp file", ex);
                 }
             }
-
-            return Path.ChangeExtension(targetFile, ".mp4");
         }
 
-        public async Task Record(MediaSourceInfo mediaSource, string targetFile, TimeSpan duration, Action onStarted, CancellationToken cancellationToken)
+        public async Task RecordInternal(MediaSourceInfo mediaSource, string tempFile, string targetFile, TimeSpan duration, Action onStarted, CancellationToken cancellationToken)
         {
-            if (mediaSource.RunTimeTicks.HasValue)
+            var httpRequestOptions = new HttpRequestOptions()
             {
-                // The media source already has a fixed duration
-                // But add another stop 1 minute later just in case the recording gets stuck for any reason
-                var durationToken = new CancellationTokenSource(duration.Add(TimeSpan.FromMinutes(1)));
-                cancellationToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, durationToken.Token).Token;
-            }
-            else
+                Url = mediaSource.Path
+            };
+
+            httpRequestOptions.BufferContent = false;
+
+            using (var response = await _httpClient.SendAsync(httpRequestOptions, "GET").ConfigureAwait(false))
             {
-                // The media source if infinite so we need to handle stopping ourselves
-                var durationToken = new CancellationTokenSource(duration);
-                cancellationToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, durationToken.Token).Token;
+                _logger.Info("Opened recording stream from tuner provider");
+
+                Directory.CreateDirectory(Path.GetDirectoryName(tempFile));
+
+                using (var output = _fileSystem.GetFileStream(tempFile, FileMode.Create, FileAccess.Write, FileShare.Read))
+                {
+                    //onStarted();
+
+                    _logger.Info("Copying recording stream to file {0}", tempFile);
+
+                    var bufferMs = 5000;
+
+                    if (mediaSource.RunTimeTicks.HasValue)
+                    {
+                        // The media source already has a fixed duration
+                        // But add another stop 1 minute later just in case the recording gets stuck for any reason
+                        var durationToken = new CancellationTokenSource(duration.Add(TimeSpan.FromMinutes(1)));
+                        cancellationToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, durationToken.Token).Token;
+                    }
+                    else
+                    {
+                        // The media source if infinite so we need to handle stopping ourselves
+                        var durationToken = new CancellationTokenSource(duration.Add(TimeSpan.FromMilliseconds(bufferMs)));
+                        cancellationToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, durationToken.Token).Token;
+                    }
+
+                    var tempFileTask = response.Content.CopyToAsync(output, StreamDefaults.DefaultCopyToBufferSize, cancellationToken);
+
+                    // Give the temp file a little time to build up
+                    await Task.Delay(bufferMs, cancellationToken).ConfigureAwait(false);
+
+                    var recordTask = Task.Run(() => RecordFromFile(mediaSource, tempFile, targetFile, duration, onStarted, cancellationToken), cancellationToken);
+
+                    await tempFileTask.ConfigureAwait(false);
+
+                    await recordTask.ConfigureAwait(false);
+                }
             }
 
+            _logger.Info("Recording completed to file {0}", targetFile);
+        }
+
+        private Task RecordFromFile(MediaSourceInfo mediaSource, string inputFile, string targetFile, TimeSpan duration, Action onStarted, CancellationToken cancellationToken)
+        {
             _targetPath = targetFile;
             _fileSystem.CreateDirectory(Path.GetDirectoryName(targetFile));
 
@@ -89,7 +144,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
                     RedirectStandardInput = true,
 
                     FileName = _mediaEncoder.EncoderPath,
-                    Arguments = GetCommandLineArgs(mediaSource, targetFile, duration),
+                    Arguments = GetCommandLineArgs(mediaSource, inputFile, targetFile, duration),
 
                     WindowStyle = ProcessWindowStyle.Hidden,
                     ErrorDialog = false
@@ -110,7 +165,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             _logFileStream = _fileSystem.GetFileStream(logFilePath, FileMode.Create, FileAccess.Write, FileShare.Read, true);
 
             var commandLineLogMessageBytes = Encoding.UTF8.GetBytes(_json.SerializeToString(mediaSource) + Environment.NewLine + Environment.NewLine + commandLineLogMessage + Environment.NewLine + Environment.NewLine);
-            await _logFileStream.WriteAsync(commandLineLogMessageBytes, 0, commandLineLogMessageBytes.Length, cancellationToken).ConfigureAwait(false);
+            _logFileStream.Write(commandLineLogMessageBytes, 0, commandLineLogMessageBytes.Length);
 
             process.Exited += (sender, args) => OnFfMpegProcessExited(process);
 
@@ -126,10 +181,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             // Important - don't await the log task or we won't be able to kill ffmpeg when the user stops playback
             StartStreamingLog(process.StandardError.BaseStream, _logFileStream);
 
-            await _taskCompletionSource.Task.ConfigureAwait(false);
+            return _taskCompletionSource.Task;
         }
 
-        private string GetCommandLineArgs(MediaSourceInfo mediaSource, string targetFile, TimeSpan duration)
+        private string GetCommandLineArgs(MediaSourceInfo mediaSource, string inputTempFile, string targetFile, TimeSpan duration)
         {
             string videoArgs;
             if (EncodeVideo(mediaSource))
@@ -145,23 +200,31 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
                 videoArgs = "-codec:v:0 copy";
             }
 
-            var commandLineArgs = "-fflags +genpts -async 1 -vsync -1 -i \"{0}\" -t {4} -sn {2} -map_metadata -1 -threads 0 {3} -y \"{1}\"";
+            var durationParam = " -t " + _mediaEncoder.GetTimeParameter(duration.Ticks);
+            var commandLineArgs = "-fflags +genpts -async 1 -vsync -1 -re -i \"{0}\"{4} -sn {2} -map_metadata -1 -threads 0 {3} -y \"{1}\"";
 
             if (mediaSource.ReadAtNativeFramerate)
             {
                 commandLineArgs = "-re " + commandLineArgs;
             }
 
-            commandLineArgs = string.Format(commandLineArgs, mediaSource.Path, targetFile, videoArgs, GetAudioArgs(mediaSource), _mediaEncoder.GetTimeParameter(duration.Ticks));
+            commandLineArgs = string.Format(commandLineArgs, inputTempFile, targetFile, videoArgs, GetAudioArgs(mediaSource), durationParam);
 
             return commandLineArgs;
         }
 
         private string GetAudioArgs(MediaSourceInfo mediaSource)
         {
-            var copyAudio = new[] { "aac", "mp3" };
+            // do not copy aac because many players have difficulty with aac_latm
+            var copyAudio = new[] { "mp3" };
             var mediaStreams = mediaSource.MediaStreams ?? new List<MediaStream>();
-            if (_liveTvOptions.EnableOriginalAudioWithEncodedRecordings || mediaStreams.Any(i => i.Type == MediaStreamType.Audio && copyAudio.Contains(i.Codec, StringComparer.OrdinalIgnoreCase)))
+            var inputAudioCodec = mediaStreams.Where(i => i.Type == MediaStreamType.Audio).Select(i => i.Codec).FirstOrDefault() ?? string.Empty;
+
+            if (copyAudio.Contains(inputAudioCodec, StringComparer.OrdinalIgnoreCase))
+            {
+                return "-codec:a:0 copy";
+            }
+            if (_liveTvOptions.EnableOriginalAudioWithEncodedRecordings && !string.Equals(inputAudioCodec, "aac", StringComparison.OrdinalIgnoreCase))
             {
                 return "-codec:a:0 copy";
             }
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
index 5d462f106..423358906 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
@@ -10,6 +10,7 @@ using System.Linq;
 using System.Threading;
 using CommonIO;
 using MediaBrowser.Controller.Power;
+using MediaBrowser.Model.LiveTv;
 
 namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
 {
@@ -71,6 +72,26 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             }
         }
 
+        public void AddOrUpdate(TimerInfo item, bool resetTimer)
+        {
+            if (resetTimer)
+            {
+                AddOrUpdate(item);
+                return;
+            }
+
+            var list = GetAll().ToList();
+
+            if (!list.Any(i => EqualityComparer(i, item)))
+            {
+                base.Add(item);
+            }
+            else
+            {
+                base.Update(item);
+            }
+        }
+
         public override void Add(TimerInfo item)
         {
             if (string.IsNullOrWhiteSpace(item.Id))
@@ -85,6 +106,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
 
         private void AddTimer(TimerInfo item)
         {
+            if (item.Status == RecordingStatus.Completed)
+            {
+                return;
+            }
+
             var startDate = RecordingHelper.GetStartTime(item);
             var now = DateTime.UtcNow;
 
@@ -117,15 +143,15 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             }
         }
 
-        public void StartTimer(TimerInfo item, TimeSpan length)
+        public void StartTimer(TimerInfo item, TimeSpan dueTime)
         {
             StopTimer(item);
 
-            var timer = new Timer(TimerCallback, item.Id, length, TimeSpan.Zero);
+            var timer = new Timer(TimerCallback, item.Id, dueTime, TimeSpan.Zero);
 
             if (_timers.TryAdd(item.Id, timer))
             {
-                _logger.Info("Creating recording timer for {0}, {1}. Timer will fire in {2} minutes", item.Id, item.Name, length.TotalMinutes.ToString(CultureInfo.InvariantCulture));
+                _logger.Info("Creating recording timer for {0}, {1}. Timer will fire in {2} minutes", item.Id, item.Name, dueTime.TotalMinutes.ToString(CultureInfo.InvariantCulture));
             }
             else
             {
diff --git a/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs b/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
index ae2a85090..e37109c14 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
@@ -506,8 +506,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
         }
 
         private async Task<List<ScheduleDirect.ShowImages>> GetImageForPrograms(
-			ListingsProviderInfo info,
-			List<string> programIds,
+            ListingsProviderInfo info,
+            List<string> programIds,
            CancellationToken cancellationToken)
         {
             var imageIdString = "[";
@@ -564,7 +564,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
 
             try
             {
-				using (Stream responce = await Get(options, false, info).ConfigureAwait(false))
+                using (Stream responce = await Get(options, false, info).ConfigureAwait(false))
                 {
                     var root = _jsonSerializer.DeserializeFromStream<List<ScheduleDirect.Headends>>(responce);
 
@@ -666,58 +666,60 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
             }
         }
 
-		private async Task<HttpResponseInfo> Post(HttpRequestOptions options, 
-			bool enableRetry,
-			ListingsProviderInfo providerInfo)
+        private async Task<HttpResponseInfo> Post(HttpRequestOptions options,
+            bool enableRetry,
+            ListingsProviderInfo providerInfo)
         {
             try
             {
                 return await _httpClient.Post(options).ConfigureAwait(false);
-			}
-			catch (HttpException ex)
-			{
-				_tokens.Clear();
-
-				if (!ex.StatusCode.HasValue || (int)ex.StatusCode.Value >= 500) 
-				{
-					enableRetry = false;
-				}
-
-				if (!enableRetry) {
-					throw;
-				}
-			}
-
-			var newToken = await GetToken (providerInfo, options.CancellationToken).ConfigureAwait (false);
-			options.RequestHeaders ["token"] = newToken;
-			return await Post (options, false, providerInfo).ConfigureAwait (false);
+            }
+            catch (HttpException ex)
+            {
+                _tokens.Clear();
+
+                if (!ex.StatusCode.HasValue || (int)ex.StatusCode.Value >= 500)
+                {
+                    enableRetry = false;
+                }
+
+                if (!enableRetry)
+                {
+                    throw;
+                }
+            }
+
+            var newToken = await GetToken(providerInfo, options.CancellationToken).ConfigureAwait(false);
+            options.RequestHeaders["token"] = newToken;
+            return await Post(options, false, providerInfo).ConfigureAwait(false);
         }
 
-		private async Task<Stream> Get(HttpRequestOptions options, 
-			bool enableRetry,
-			ListingsProviderInfo providerInfo)
+        private async Task<Stream> Get(HttpRequestOptions options,
+            bool enableRetry,
+            ListingsProviderInfo providerInfo)
         {
             try
             {
                 return await _httpClient.Get(options).ConfigureAwait(false);
-			}
-			catch (HttpException ex)
-			{
-				_tokens.Clear();
-
-				if (!ex.StatusCode.HasValue || (int)ex.StatusCode.Value >= 500) 
-				{
-					enableRetry = false;
-				}
-
-				if (!enableRetry) {
-					throw;
-				}
-			}
-
-			var newToken = await GetToken (providerInfo, options.CancellationToken).ConfigureAwait (false);
-			options.RequestHeaders ["token"] = newToken;
-			return await Get (options, false, providerInfo).ConfigureAwait (false);
+            }
+            catch (HttpException ex)
+            {
+                _tokens.Clear();
+
+                if (!ex.StatusCode.HasValue || (int)ex.StatusCode.Value >= 500)
+                {
+                    enableRetry = false;
+                }
+
+                if (!enableRetry)
+                {
+                    throw;
+                }
+            }
+
+            var newToken = await GetToken(providerInfo, options.CancellationToken).ConfigureAwait(false);
+            options.RequestHeaders["token"] = newToken;
+            return await Get(options, false, providerInfo).ConfigureAwait(false);
         }
 
         private async Task<string> GetTokenInternal(string username, string password,
@@ -734,7 +736,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
             //_logger.Info("Obtaining token from Schedules Direct from addres: " + httpOptions.Url + " with body " +
             // httpOptions.RequestContent);
 
-			using (var responce = await Post(httpOptions, false, null).ConfigureAwait(false))
+            using (var responce = await Post(httpOptions, false, null).ConfigureAwait(false))
             {
                 var root = _jsonSerializer.DeserializeFromStream<ScheduleDirect.Token>(responce.Content);
                 if (root.message == "OK")
@@ -816,7 +818,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
 
             try
             {
-				using (var response = await Get(options, false, null).ConfigureAwait(false))
+                using (var response = await Get(options, false, null).ConfigureAwait(false))
                 {
                     var root = _jsonSerializer.DeserializeFromStream<ScheduleDirect.Lineups>(response);
 
@@ -869,6 +871,75 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
             return GetHeadends(info, country, location, CancellationToken.None);
         }
 
+        public async Task<List<ChannelInfo>> GetChannels(ListingsProviderInfo info, CancellationToken cancellationToken)
+        {
+            var listingsId = info.ListingsId;
+            if (string.IsNullOrWhiteSpace(listingsId))
+            {
+                throw new Exception("ListingsId required");
+            }
+
+            await AddMetadata(info, new List<ChannelInfo>(), cancellationToken).ConfigureAwait(false);
+
+            var token = await GetToken(info, cancellationToken);
+
+            if (string.IsNullOrWhiteSpace(token))
+            {
+                throw new Exception("token required");
+            }
+
+            var httpOptions = new HttpRequestOptions()
+            {
+                Url = ApiUrl + "/lineups/" + listingsId,
+                UserAgent = UserAgent,
+                CancellationToken = cancellationToken,
+                LogErrorResponseBody = true,
+                // The data can be large so give it some extra time
+                TimeoutMs = 60000
+            };
+
+            httpOptions.RequestHeaders["token"] = token;
+
+            var list = new List<ChannelInfo>();
+
+            using (var response = await Get(httpOptions, true, info).ConfigureAwait(false))
+            {
+                var root = _jsonSerializer.DeserializeFromStream<ScheduleDirect.Channel>(response);
+                _logger.Info("Found " + root.map.Count + " channels on the lineup on ScheduleDirect");
+                _logger.Info("Mapping Stations to Channel");
+                foreach (ScheduleDirect.Map map in root.map)
+                {
+                    var channelNumber = map.logicalChannelNumber;
+
+                    if (string.IsNullOrWhiteSpace(channelNumber))
+                    {
+                        channelNumber = map.channel;
+                    }
+                    if (string.IsNullOrWhiteSpace(channelNumber))
+                    {
+                        channelNumber = map.atscMajor + "." + map.atscMinor;
+                    }
+                    channelNumber = channelNumber.TrimStart('0');
+
+                    var name = channelNumber;
+                    var station = GetStation(listingsId, channelNumber, null);
+
+                    if (station != null)
+                    {
+                        name = station.name;
+                    }
+
+                    list.Add(new ChannelInfo
+                    {
+                        Number = channelNumber,
+                        Name = name
+                    });
+                }
+            }
+
+            return list;
+        }
+
         public class ScheduleDirect
         {
             public class Token
diff --git a/MediaBrowser.Server.Implementations/LiveTv/Listings/XmlTv.cs b/MediaBrowser.Server.Implementations/LiveTv/Listings/XmlTv.cs
deleted file mode 100644
index ac316f9a1..000000000
--- a/MediaBrowser.Server.Implementations/LiveTv/Listings/XmlTv.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.LiveTv;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Server.Implementations.LiveTv.Listings
-{
-    public class XmlTv : IListingsProvider
-    {
-        public string Name
-        {
-            get { return "XmlTV"; }
-        }
-
-        public string Type
-        {
-            get { return "xmltv"; }
-        }
-
-        public Task<IEnumerable<ProgramInfo>> GetProgramsAsync(ListingsProviderInfo info, string channelNumber, string channelName, DateTime startDateUtc, DateTime endDateUtc, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
-
-        public async Task AddMetadata(ListingsProviderInfo info, List<ChannelInfo> channels, CancellationToken cancellationToken)
-        {
-            // Might not be needed
-        }
-
-        public async Task Validate(ListingsProviderInfo info, bool validateLogin, bool validateListings)
-        {
-            // Check that the path or url is valid. If not, throw a file not found exception
-        }
-
-        public Task<List<NameIdPair>> GetLineups(ListingsProviderInfo info, string country, string location)
-        {
-            // In theory this should never be called because there is always only one lineup
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
new file mode 100644
index 000000000..1e82e3fce
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
@@ -0,0 +1,219 @@
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.LiveTv;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Emby.XmlTv.Classes;
+using Emby.XmlTv.Entities;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Model.Logging;
+
+namespace MediaBrowser.Server.Implementations.LiveTv.Listings
+{
+    public class XmlTvListingsProvider : IListingsProvider
+    {
+        private readonly IServerConfigurationManager _config;
+        private readonly IHttpClient _httpClient;
+        private readonly ILogger _logger;
+
+        public XmlTvListingsProvider(IServerConfigurationManager config, IHttpClient httpClient, ILogger logger)
+        {
+            _config = config;
+            _httpClient = httpClient;
+            _logger = logger;
+        }
+
+        public string Name
+        {
+            get { return "XmlTV"; }
+        }
+
+        public string Type
+        {
+            get { return "xmltv"; }
+        }
+
+        private string GetLanguage()
+        {
+            return _config.Configuration.PreferredMetadataLanguage;
+        }
+
+        private async Task<string> GetXml(string path, CancellationToken cancellationToken)
+        {
+            _logger.Info("xmltv path: {0}", path);
+
+            if (!path.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+            {
+                return path;
+            }
+
+            var cacheFilename = DateTime.UtcNow.DayOfYear.ToString(CultureInfo.InvariantCulture) + "-" + DateTime.UtcNow.Hour.ToString(CultureInfo.InvariantCulture) + ".xml";
+            var cacheFile = Path.Combine(_config.ApplicationPaths.CachePath, "xmltv", cacheFilename);
+            if (File.Exists(cacheFile))
+            {
+                return cacheFile;
+            }
+
+            _logger.Info("Downloading xmltv listings from {0}", path);
+
+            var tempFile = await _httpClient.GetTempFile(new HttpRequestOptions
+            {
+                CancellationToken = cancellationToken,
+                Url = path,
+                Progress = new Progress<Double>(),
+                DecompressionMethod = DecompressionMethods.GZip,
+
+                // It's going to come back gzipped regardless of this value
+                // So we need to make sure the decompression method is set to gzip
+                EnableHttpCompression = true
+
+            }).ConfigureAwait(false);
+
+            Directory.CreateDirectory(Path.GetDirectoryName(cacheFile));
+
+            using (var stream = File.OpenRead(tempFile))
+            {
+                using (var reader = new StreamReader(stream, Encoding.UTF8))
+                {
+                    using (var fileStream = File.OpenWrite(cacheFile))
+                    {
+                        using (var writer = new StreamWriter(fileStream))
+                        {
+                            while (!reader.EndOfStream)
+                            {
+                                writer.WriteLine(reader.ReadLine());
+                            }
+                        }
+                    }
+                }
+            }
+
+            _logger.Debug("Returning xmltv path {0}", cacheFile);
+            return cacheFile;
+        }
+
+        public async Task<IEnumerable<ProgramInfo>> GetProgramsAsync(ListingsProviderInfo info, string channelNumber, string channelName, DateTime startDateUtc, DateTime endDateUtc, CancellationToken cancellationToken)
+        {
+            if (!await EmbyTV.EmbyTVRegistration.Instance.EnableXmlTv().ConfigureAwait(false))
+            {
+                var length = endDateUtc - startDateUtc;
+                if (length.TotalDays > 1)
+                {
+                    endDateUtc = startDateUtc.AddDays(1);
+                }
+            }
+
+            var path = await GetXml(info.Path, cancellationToken).ConfigureAwait(false);
+            var reader = new XmlTvReader(path, GetLanguage(), null);
+
+            var results = reader.GetProgrammes(channelNumber, startDateUtc, endDateUtc, cancellationToken);
+            return results.Select(p => new ProgramInfo()
+            {
+                ChannelId = p.ChannelId,
+                EndDate = GetDate(p.EndDate),
+                EpisodeNumber = p.Episode == null ? null : p.Episode.Episode,
+                EpisodeTitle = p.Episode == null ? null : p.Episode.Title,
+                Genres = p.Categories,
+                Id = String.Format("{0}_{1:O}", p.ChannelId, p.StartDate), // Construct an id from the channel and start date,
+                StartDate = GetDate(p.StartDate),
+                Name = p.Title,
+                Overview = p.Description,
+                ShortOverview = p.Description,
+                ProductionYear = !p.CopyrightDate.HasValue ? (int?)null : p.CopyrightDate.Value.Year,
+                SeasonNumber = p.Episode == null ? null : p.Episode.Series,
+                IsSeries = p.Episode != null,
+                IsRepeat = p.IsRepeat,
+                IsPremiere = p.Premiere != null,
+                IsKids = p.Categories.Any(c => info.KidsCategories.Contains(c, StringComparer.InvariantCultureIgnoreCase)),
+                IsMovie = p.Categories.Any(c => info.MovieCategories.Contains(c, StringComparer.InvariantCultureIgnoreCase)),
+                IsNews = p.Categories.Any(c => info.NewsCategories.Contains(c, StringComparer.InvariantCultureIgnoreCase)),
+                IsSports = p.Categories.Any(c => info.SportsCategories.Contains(c, StringComparer.InvariantCultureIgnoreCase)),
+                ImageUrl = p.Icon != null && !String.IsNullOrEmpty(p.Icon.Source) ? p.Icon.Source : null,
+                HasImage = p.Icon != null && !String.IsNullOrEmpty(p.Icon.Source),
+                OfficialRating = p.Rating != null && !String.IsNullOrEmpty(p.Rating.Value) ? p.Rating.Value : null,
+                CommunityRating = p.StarRating.HasValue ? p.StarRating.Value : (float?)null,
+                SeriesId = p.Episode != null ? p.Title.GetMD5().ToString("N") : null
+            });
+        }
+
+        private DateTime GetDate(DateTime date)
+        {
+            if (date.Kind != DateTimeKind.Utc)
+            {
+                date = DateTime.SpecifyKind(date, DateTimeKind.Utc);
+            }
+            return date;
+        }
+
+        public async Task AddMetadata(ListingsProviderInfo info, List<ChannelInfo> channels, CancellationToken cancellationToken)
+        {
+            // Add the channel image url
+            var path = await GetXml(info.Path, cancellationToken).ConfigureAwait(false);
+            var reader = new XmlTvReader(path, GetLanguage(), null);
+            var results = reader.GetChannels().ToList();
+
+            if (channels != null)
+            {
+                channels.ForEach(c =>
+                {
+                    var channelNumber = info.GetMappedChannel(c.Number);
+                    var match = results.FirstOrDefault(r => string.Equals(r.Id, channelNumber, StringComparison.OrdinalIgnoreCase));
+
+                    if (match != null && match.Icon != null && !String.IsNullOrEmpty(match.Icon.Source))
+                    {
+                        c.ImageUrl = match.Icon.Source;
+                    }
+                });
+            }
+        }
+
+        public Task Validate(ListingsProviderInfo info, bool validateLogin, bool validateListings)
+        {
+            // Assume all urls are valid. check files for existence
+            if (!info.Path.StartsWith("http", StringComparison.OrdinalIgnoreCase) && !File.Exists(info.Path))
+            {
+                throw new FileNotFoundException("Could not find the XmlTv file specified:", info.Path);
+            }
+
+            return Task.FromResult(true);
+        }
+
+        public async Task<List<NameIdPair>> GetLineups(ListingsProviderInfo info, string country, string location)
+        {
+            // In theory this should never be called because there is always only one lineup
+            var path = await GetXml(info.Path, CancellationToken.None).ConfigureAwait(false);
+            var reader = new XmlTvReader(path, GetLanguage(), null);
+            var results = reader.GetChannels();
+
+            // Should this method be async?
+            return results.Select(c => new NameIdPair() { Id = c.Id, Name = c.DisplayName }).ToList();
+        }
+
+        public async Task<List<ChannelInfo>> GetChannels(ListingsProviderInfo info, CancellationToken cancellationToken)
+        {
+            // In theory this should never be called because there is always only one lineup
+            var path = await GetXml(info.Path, cancellationToken).ConfigureAwait(false);
+            var reader = new XmlTvReader(path, GetLanguage(), null);
+            var results = reader.GetChannels();
+
+            // Should this method be async?
+            return results.Select(c => new ChannelInfo()
+            {
+                Id = c.Id,
+                Name = c.DisplayName,
+                ImageUrl = c.Icon != null && !String.IsNullOrEmpty(c.Icon.Source) ? c.Icon.Source : null,
+                Number = c.Id
+
+            }).ToList();
+        }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index bf7f561ec..f32a4b59e 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -30,6 +30,8 @@ using System.Threading.Tasks;
 using CommonIO;
 using IniParser;
 using IniParser.Model;
+using MediaBrowser.Common.Events;
+using MediaBrowser.Model.Events;
 
 namespace MediaBrowser.Server.Implementations.LiveTv
 {
@@ -64,6 +66,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv
         private readonly List<IListingsProvider> _listingProviders = new List<IListingsProvider>();
         private readonly IFileSystem _fileSystem;
 
+        public event EventHandler<GenericEventArgs<TimerEventInfo>> SeriesTimerCancelled;
+        public event EventHandler<GenericEventArgs<TimerEventInfo>> TimerCancelled;
+        public event EventHandler<GenericEventArgs<TimerEventInfo>> TimerCreated;
+        public event EventHandler<GenericEventArgs<TimerEventInfo>> SeriesTimerCreated;
+
         public LiveTvManager(IApplicationHost appHost, IServerConfigurationManager config, ILogger logger, IItemRepository itemRepo, IImageProcessor imageProcessor, IUserDataManager userDataManager, IDtoService dtoService, IUserManager userManager, ILibraryManager libraryManager, ITaskManager taskManager, ILocalizationManager localization, IJsonSerializer jsonSerializer, IProviderManager providerManager, IFileSystem fileSystem)
         {
             _config = config;
@@ -133,10 +140,13 @@ namespace MediaBrowser.Server.Implementations.LiveTv
         {
             var user = string.IsNullOrEmpty(query.UserId) ? null : _userManager.GetUserById(query.UserId);
 
+            var topFolder = await GetInternalLiveTvFolder(cancellationToken).ConfigureAwait(false);
+
             var channels = _libraryManager.GetItemList(new InternalItemsQuery
             {
                 IncludeItemTypes = new[] { typeof(LiveTvChannel).Name },
-                SortBy = new[] { ItemSortBy.SortName }
+                SortBy = new[] { ItemSortBy.SortName },
+                TopParentIds = new[] { topFolder.Id.ToString("N") }
 
             }).Cast<LiveTvChannel>();
 
@@ -646,7 +656,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             item.Audio = info.Audio;
             item.ChannelId = channel.Id.ToString("N");
             item.CommunityRating = item.CommunityRating ?? info.CommunityRating;
-            item.EndDate = info.EndDate;
+
             item.EpisodeTitle = info.EpisodeTitle;
             item.ExternalId = info.Id;
             item.Genres = info.Genres;
@@ -663,7 +673,19 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             item.OfficialRating = item.OfficialRating ?? info.OfficialRating;
             item.Overview = item.Overview ?? info.Overview;
             item.RunTimeTicks = (info.EndDate - info.StartDate).Ticks;
+
+            if (item.StartDate != info.StartDate)
+            {
+                forceUpdate = true;
+            }
             item.StartDate = info.StartDate;
+
+            if (item.EndDate != info.EndDate)
+            {
+                forceUpdate = true;
+            }
+            item.EndDate = info.EndDate;
+
             item.HomePageUrl = info.HomePageUrl;
 
             item.ProductionYear = info.ProductionYear;
@@ -884,6 +906,14 @@ namespace MediaBrowser.Server.Implementations.LiveTv
         {
             var user = string.IsNullOrEmpty(query.UserId) ? null : _userManager.GetUserById(query.UserId);
 
+            var topFolder = await GetInternalLiveTvFolder(cancellationToken).ConfigureAwait(false);
+
+            if (query.SortBy.Length == 0)
+            {
+                // Unless something else was specified, order by start date to take advantage of a specialized index
+                query.SortBy = new[] { ItemSortBy.StartDate };
+            }
+
             var internalQuery = new InternalItemsQuery(user)
             {
                 IncludeItemTypes = new[] { typeof(LiveTvProgram).Name },
@@ -900,7 +930,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 Limit = query.Limit,
                 SortBy = query.SortBy,
                 SortOrder = query.SortOrder ?? SortOrder.Ascending,
-                EnableTotalRecordCount = query.EnableTotalRecordCount
+                EnableTotalRecordCount = query.EnableTotalRecordCount,
+                TopParentIds = new[] { topFolder.Id.ToString("N") }
             };
 
             if (query.HasAired.HasValue)
@@ -917,7 +948,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             var queryResult = _libraryManager.QueryItems(internalQuery);
 
-            var returnArray = _dtoService.GetBaseItemDtos(queryResult.Items, options, user).ToArray();
+            var returnArray = (await _dtoService.GetBaseItemDtos(queryResult.Items, options, user).ConfigureAwait(false)).ToArray();
 
             var result = new QueryResult<BaseItemDto>
             {
@@ -932,6 +963,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
         {
             var user = _userManager.GetUserById(query.UserId);
 
+            var topFolder = await GetInternalLiveTvFolder(cancellationToken).ConfigureAwait(false);
+
             var internalQuery = new InternalItemsQuery(user)
             {
                 IncludeItemTypes = new[] { typeof(LiveTvProgram).Name },
@@ -940,12 +973,13 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 IsSports = query.IsSports,
                 IsKids = query.IsKids,
                 EnableTotalRecordCount = query.EnableTotalRecordCount,
-                SortBy = new[] { ItemSortBy.StartDate }
+                SortBy = new[] { ItemSortBy.StartDate },
+                TopParentIds = new[] { topFolder.Id.ToString("N") }
             };
 
             if (query.Limit.HasValue)
             {
-                internalQuery.Limit = Math.Max(query.Limit.Value * 5, 300);
+                internalQuery.Limit = Math.Max(query.Limit.Value * 4, 200);
             }
 
             if (query.HasAired.HasValue)
@@ -994,7 +1028,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             var user = _userManager.GetUserById(query.UserId);
 
-            var returnArray = _dtoService.GetBaseItemDtos(internalResult.Items, options, user).ToArray();
+            var returnArray = (await _dtoService.GetBaseItemDtos(internalResult.Items, options, user).ConfigureAwait(false)).ToArray();
 
             var result = new QueryResult<BaseItemDto>
             {
@@ -1098,6 +1132,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
         private async Task RefreshChannelsInternal(IProgress<double> progress, CancellationToken cancellationToken)
         {
+            EmbyTV.EmbyTV.Current.CreateRecordingFolders();
+
             var numComplete = 0;
             double progressPerService = _services.Count == 0
                 ? 0
@@ -1396,7 +1432,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 ExcludeLocationTypes = new[] { LocationType.Virtual },
                 Limit = Math.Min(200, query.Limit ?? int.MaxValue),
                 SortBy = new[] { ItemSortBy.DateCreated },
-                SortOrder = SortOrder.Descending
+                SortOrder = SortOrder.Descending,
+                EnableTotalRecordCount = query.EnableTotalRecordCount
             });
         }
 
@@ -1425,7 +1462,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 internalQuery.ChannelIds = new[] { query.ChannelId };
             }
 
-            var queryResult = _libraryManager.GetItemList(internalQuery, new string[] { });
+            var queryResult = _libraryManager.GetItemList(internalQuery);
             IEnumerable<ILiveTvRecording> recordings = queryResult.Cast<ILiveTvRecording>();
 
             if (!string.IsNullOrWhiteSpace(query.Id))
@@ -1629,7 +1666,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             var internalResult = await GetInternalRecordings(query, cancellationToken).ConfigureAwait(false);
 
-            var returnArray = _dtoService.GetBaseItemDtos(internalResult.Items, options, user).ToArray();
+            var returnArray = (await _dtoService.GetBaseItemDtos(internalResult.Items, options, user).ConfigureAwait(false)).ToArray();
 
             return new QueryResult<BaseItemDto>
             {
@@ -1656,6 +1693,18 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             var results = await Task.WhenAll(tasks).ConfigureAwait(false);
             var timers = results.SelectMany(i => i.ToList());
 
+            if (query.IsActive.HasValue)
+            {
+                if (query.IsActive.Value)
+                {
+                    timers = timers.Where(i => i.Item1.Status == RecordingStatus.InProgress);
+                }
+                else
+                {
+                    timers = timers.Where(i => i.Item1.Status != RecordingStatus.InProgress);
+                }
+            }
+
             if (!string.IsNullOrEmpty(query.ChannelId))
             {
                 var guid = new Guid(query.ChannelId);
@@ -1757,6 +1806,14 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             await service.CancelTimerAsync(timer.ExternalId, CancellationToken.None).ConfigureAwait(false);
             _lastRecordingRefreshTime = DateTime.MinValue;
+
+            EventHelper.QueueEventIfNotNull(TimerCancelled, this, new GenericEventArgs<TimerEventInfo>
+            {
+                Argument = new TimerEventInfo
+                {
+                    Id = id
+                }
+            }, _logger);
         }
 
         public async Task CancelSeriesTimer(string id)
@@ -1772,6 +1829,14 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             await service.CancelSeriesTimerAsync(timer.ExternalId, CancellationToken.None).ConfigureAwait(false);
             _lastRecordingRefreshTime = DateTime.MinValue;
+
+            EventHelper.QueueEventIfNotNull(SeriesTimerCancelled, this, new GenericEventArgs<TimerEventInfo>
+            {
+                Argument = new TimerEventInfo
+                {
+                    Id = id
+                }
+            }, _logger);
         }
 
         public async Task<BaseItemDto> GetRecording(string id, DtoOptions options, CancellationToken cancellationToken, User user = null)
@@ -1868,9 +1933,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 MaxStartDate = now,
                 MinEndDate = now,
                 Limit = channelIds.Length,
-                SortBy = new[] { "StartDate" }
+                SortBy = new[] { "StartDate" },
+                TopParentIds = new[] { GetInternalLiveTvFolder(CancellationToken.None).Result.Id.ToString("N") }
 
-            }, new string[] { }).ToList();
+            }).ToList();
 
             foreach (var tuple in tuples)
             {
@@ -1957,10 +2023,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             var defaults = await GetNewTimerDefaultsInternal(cancellationToken, program).ConfigureAwait(false);
             var info = _tvDtoService.GetSeriesTimerInfoDto(defaults.Item1, defaults.Item2, null);
 
-            info.Days = new List<DayOfWeek>
-            {
-                program.StartDate.ToLocalTime().DayOfWeek
-            };
+            info.Days = defaults.Item1.Days;
 
             info.DayPattern = _tvDtoService.GetDayPattern(info.Days);
 
@@ -1991,9 +2054,29 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             var defaultValues = await service.GetNewTimerDefaultsAsync(cancellationToken).ConfigureAwait(false);
             info.Priority = defaultValues.Priority;
 
-            await service.CreateTimerAsync(info, cancellationToken).ConfigureAwait(false);
+            string newTimerId = null;
+            var supportsNewTimerIds = service as ISupportsNewTimerIds;
+            if (supportsNewTimerIds != null)
+            {
+                newTimerId = await supportsNewTimerIds.CreateTimer(info, cancellationToken).ConfigureAwait(false);
+                newTimerId = _tvDtoService.GetInternalTimerId(timer.ServiceName, newTimerId).ToString("N");
+            }
+            else
+            {
+                await service.CreateTimerAsync(info, cancellationToken).ConfigureAwait(false);
+            }
+
             _lastRecordingRefreshTime = DateTime.MinValue;
             _logger.Info("New recording scheduled");
+
+            EventHelper.QueueEventIfNotNull(TimerCreated, this, new GenericEventArgs<TimerEventInfo>
+            {
+                Argument = new TimerEventInfo
+                {
+                    ProgramId = _tvDtoService.GetInternalProgramId(timer.ServiceName, info.ProgramId).ToString("N"),
+                    Id = newTimerId
+                }
+            }, _logger);
         }
 
         public async Task CreateSeriesTimer(SeriesTimerInfoDto timer, CancellationToken cancellationToken)
@@ -2006,8 +2089,28 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             var defaultValues = await service.GetNewTimerDefaultsAsync(cancellationToken).ConfigureAwait(false);
             info.Priority = defaultValues.Priority;
 
-            await service.CreateSeriesTimerAsync(info, cancellationToken).ConfigureAwait(false);
+            string newTimerId = null;
+            var supportsNewTimerIds = service as ISupportsNewTimerIds;
+            if (supportsNewTimerIds != null)
+            {
+                newTimerId = await supportsNewTimerIds.CreateSeriesTimer(info, cancellationToken).ConfigureAwait(false);
+                newTimerId = _tvDtoService.GetInternalSeriesTimerId(timer.ServiceName, newTimerId).ToString("N");
+            }
+            else
+            {
+                await service.CreateSeriesTimerAsync(info, cancellationToken).ConfigureAwait(false);
+            }
+
             _lastRecordingRefreshTime = DateTime.MinValue;
+
+            EventHelper.QueueEventIfNotNull(SeriesTimerCreated, this, new GenericEventArgs<TimerEventInfo>
+            {
+                Argument = new TimerEventInfo
+                {
+                    ProgramId = _tvDtoService.GetInternalProgramId(timer.ServiceName, info.ProgramId).ToString("N"),
+                    Id = newTimerId
+                }
+            }, _logger);
         }
 
         public async Task UpdateTimer(TimerInfoDto timer, CancellationToken cancellationToken)
@@ -2423,6 +2526,79 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             return info;
         }
 
+        public void DeleteListingsProvider(string id)
+        {
+            var config = GetConfiguration();
+
+            config.ListingProviders = config.ListingProviders.Where(i => !string.Equals(id, i.Id, StringComparison.OrdinalIgnoreCase)).ToList();
+
+            _config.SaveConfiguration("livetv", config);
+            _taskManager.CancelIfRunningAndQueue<RefreshChannelsScheduledTask>();
+        }
+
+        public async Task<TunerChannelMapping> SetChannelMapping(string providerId, string tunerChannelNumber, string providerChannelNumber)
+        {
+            var config = GetConfiguration();
+
+            var listingsProviderInfo = config.ListingProviders.First(i => string.Equals(providerId, i.Id, StringComparison.OrdinalIgnoreCase));
+            listingsProviderInfo.ChannelMappings = listingsProviderInfo.ChannelMappings.Where(i => !string.Equals(i.Name, tunerChannelNumber, StringComparison.OrdinalIgnoreCase)).ToArray();
+
+            if (!string.Equals(tunerChannelNumber, providerChannelNumber, StringComparison.OrdinalIgnoreCase))
+            {
+                var list = listingsProviderInfo.ChannelMappings.ToList();
+                list.Add(new NameValuePair
+                {
+                    Name = tunerChannelNumber,
+                    Value = providerChannelNumber
+                });
+                listingsProviderInfo.ChannelMappings = list.ToArray();
+            }
+
+            _config.SaveConfiguration("livetv", config);
+
+            var tunerChannels = await GetChannelsForListingsProvider(providerId, CancellationToken.None)
+                        .ConfigureAwait(false);
+
+            var providerChannels = await GetChannelsFromListingsProviderData(providerId, CancellationToken.None)
+                     .ConfigureAwait(false);
+
+            var mappings = listingsProviderInfo.ChannelMappings.ToList();
+
+            var tunerChannelMappings =
+                tunerChannels.Select(i => GetTunerChannelMapping(i, mappings, providerChannels)).ToList();
+
+            _taskManager.CancelIfRunningAndQueue<RefreshChannelsScheduledTask>();
+
+            return tunerChannelMappings.First(i => string.Equals(i.Number, tunerChannelNumber, StringComparison.OrdinalIgnoreCase));
+        }
+
+        public TunerChannelMapping GetTunerChannelMapping(ChannelInfo channel, List<NameValuePair> mappings, List<ChannelInfo> providerChannels)
+        {
+            var result = new TunerChannelMapping
+            {
+                Name = channel.Number + " " + channel.Name,
+                Number = channel.Number
+            };
+
+            var mapping = mappings.FirstOrDefault(i => string.Equals(i.Name, channel.Number, StringComparison.OrdinalIgnoreCase));
+            var providerChannelNumber = channel.Number;
+
+            if (mapping != null)
+            {
+                providerChannelNumber = mapping.Value;
+            }
+
+            var providerChannel = providerChannels.FirstOrDefault(i => string.Equals(i.Number, providerChannelNumber, StringComparison.OrdinalIgnoreCase));
+
+            if (providerChannel != null)
+            {
+                result.ProviderChannelNumber = providerChannel.Number;
+                result.ProviderChannelName = providerChannel.Name;
+            }
+
+            return result;
+        }
+
         public Task<List<NameIdPair>> GetLineups(string providerType, string providerId, string country, string location)
         {
             var config = GetConfiguration();
@@ -2522,5 +2698,18 @@ namespace MediaBrowser.Server.Implementations.LiveTv
         {
             return new TunerHosts.SatIp.ChannelScan(_logger).Scan(info, cancellationToken);
         }
+
+        public Task<List<ChannelInfo>> GetChannelsForListingsProvider(string id, CancellationToken cancellationToken)
+        {
+            var info = GetConfiguration().ListingProviders.First(i => string.Equals(i.Id, id, StringComparison.OrdinalIgnoreCase));
+            return EmbyTV.EmbyTV.Current.GetChannelsForListingsProvider(info, cancellationToken);
+        }
+
+        public Task<List<ChannelInfo>> GetChannelsFromListingsProviderData(string id, CancellationToken cancellationToken)
+        {
+            var info = GetConfiguration().ListingProviders.First(i => string.Equals(i.Id, id, StringComparison.OrdinalIgnoreCase));
+            var provider = _listingProviders.First(i => string.Equals(i.Type, info.Type, StringComparison.OrdinalIgnoreCase));
+            return provider.GetChannels(info, cancellationToken);
+        }
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
index d3bb87bc7..cdba1873e 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
@@ -83,7 +83,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             }
 
             var list = sources.ToList();
-            var serverUrl = _appHost.LocalApiUrl;
+            var serverUrl = await _appHost.GetLocalApiUrl().ConfigureAwait(false);
 
             foreach (var source in list)
             {
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 0aa499f69..c78306911 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -46,17 +46,18 @@
       <HintPath>..\packages\CommonIO.1.0.0.9\lib\net45\CommonIO.dll</HintPath>
     </Reference>
     <Reference Include="Emby.XmlTv, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Emby.XmlTv.1.0.0.48\lib\net45\Emby.XmlTv.dll</HintPath>
+      <HintPath>..\packages\Emby.XmlTv.1.0.0.55\lib\net45\Emby.XmlTv.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="INIFileParser">
-      <HintPath>..\packages\ini-parser.2.2.4\lib\net20\INIFileParser.dll</HintPath>
+    <Reference Include="INIFileParser, Version=2.3.0.0, Culture=neutral, PublicKeyToken=79af7b307b65cf3c, processorArchitecture=MSIL">
+      <HintPath>..\packages\ini-parser.2.3.0\lib\net20\INIFileParser.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Interfaces.IO">
       <HintPath>..\packages\Interfaces.IO.1.0.0.5\lib\portable-net45+sl4+wp71+win8+wpa81\Interfaces.IO.dll</HintPath>
     </Reference>
-    <Reference Include="MediaBrowser.Naming, Version=1.0.5981.21615, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Naming.1.0.0.50\lib\portable-net45+sl4+wp71+win8+wpa81\MediaBrowser.Naming.dll</HintPath>
+    <Reference Include="MediaBrowser.Naming, Version=1.0.6012.15754, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MediaBrowser.Naming.1.0.0.52\lib\portable-net45+sl4+wp71+win8+wpa81\MediaBrowser.Naming.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="MoreLinq">
@@ -68,8 +69,8 @@
     <Reference Include="ServiceStack.Api.Swagger">
       <HintPath>..\ThirdParty\ServiceStack\ServiceStack.Api.Swagger.dll</HintPath>
     </Reference>
-    <Reference Include="SimpleInjector, Version=3.1.4.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
-      <HintPath>..\packages\SimpleInjector.3.1.4\lib\net45\SimpleInjector.dll</HintPath>
+    <Reference Include="SimpleInjector, Version=3.2.0.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
+      <HintPath>..\packages\SimpleInjector.3.2.0\lib\net45\SimpleInjector.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="SocketHttpListener, Version=1.0.5955.1537, Culture=neutral, processorArchitecture=MSIL">
@@ -141,6 +142,7 @@
     <Compile Include="EntryPoints\LoadRegistrations.cs" />
     <Compile Include="EntryPoints\Notifications\Notifications.cs" />
     <Compile Include="EntryPoints\Notifications\WebSocketNotifier.cs" />
+    <Compile Include="EntryPoints\RecordingNotifier.cs" />
     <Compile Include="EntryPoints\RefreshUsersMetadata.cs" />
     <Compile Include="EntryPoints\UsageEntryPoint.cs" />
     <Compile Include="Connect\ConnectEntryPoint.cs" />
@@ -180,6 +182,7 @@
     <Compile Include="HttpServer\SocketSharp\WebSocketSharpRequest.cs" />
     <Compile Include="HttpServer\SocketSharp\WebSocketSharpResponse.cs" />
     <Compile Include="Intros\DefaultIntroProvider.cs" />
+    <Compile Include="IO\FileRefresher.cs" />
     <Compile Include="IO\LibraryMonitor.cs" />
     <Compile Include="Library\CoreResolutionIgnoreRule.cs" />
     <Compile Include="Library\LibraryManager.cs" />
@@ -223,6 +226,7 @@
     <Compile Include="LiveTv\ChannelImageProvider.cs" />
     <Compile Include="LiveTv\EmbyTV\DirectRecorder.cs" />
     <Compile Include="LiveTv\EmbyTV\EmbyTV.cs" />
+    <Compile Include="LiveTv\EmbyTV\EmbyTVRegistration.cs" />
     <Compile Include="LiveTv\EmbyTV\EncodedRecorder.cs" />
     <Compile Include="LiveTv\EmbyTV\EntryPoint.cs" />
     <Compile Include="LiveTv\EmbyTV\IRecorder.cs" />
@@ -231,7 +235,7 @@
     <Compile Include="LiveTv\EmbyTV\SeriesTimerManager.cs" />
     <Compile Include="LiveTv\EmbyTV\TimerManager.cs" />
     <Compile Include="LiveTv\Listings\SchedulesDirect.cs" />
-    <Compile Include="LiveTv\Listings\XmlTv.cs" />
+    <Compile Include="LiveTv\Listings\XmlTvListingsProvider.cs" />
     <Compile Include="LiveTv\LiveTvConfigurationFactory.cs" />
     <Compile Include="LiveTv\LiveTvDtoService.cs" />
     <Compile Include="LiveTv\LiveTvManager.cs" />
@@ -276,7 +280,6 @@
     <Compile Include="Notifications\NotificationManager.cs" />
     <Compile Include="Persistence\SqliteFileOrganizationRepository.cs" />
     <Compile Include="Notifications\SqliteNotificationsRepository.cs" />
-    <Compile Include="Persistence\SqliteProviderInfoRepository.cs" />
     <Compile Include="Persistence\TypeMapper.cs" />
     <Compile Include="Photos\BaseDynamicImageProvider.cs" />
     <Compile Include="Playlists\ManualPlaylistsFolder.cs" />
@@ -390,7 +393,103 @@
     <EmbeddedResource Include="Localization\Ratings\ru.txt" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\backbone-min.js">
+      <Link>swagger-ui\lib\backbone-min.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\handlebars-2.0.0.js">
+      <Link>swagger-ui\lib\handlebars-2.0.0.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\highlight.7.3.pack.js">
+      <Link>swagger-ui\lib\highlight.7.3.pack.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\jquery-1.8.0.min.js">
+      <Link>swagger-ui\lib\jquery-1.8.0.min.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\jquery.ba-bbq.min.js">
+      <Link>swagger-ui\lib\jquery.ba-bbq.min.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\jquery.slideto.min.js">
+      <Link>swagger-ui\lib\jquery.slideto.min.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\jquery.wiggle.min.js">
+      <Link>swagger-ui\lib\jquery.wiggle.min.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\marked.js">
+      <Link>swagger-ui\lib\marked.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\shred.bundle.js">
+      <Link>swagger-ui\lib\shred.bundle.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\swagger-client.js">
+      <Link>swagger-ui\lib\swagger-client.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\swagger-oauth.js">
+      <Link>swagger-ui\lib\swagger-oauth.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\underscore-min.js">
+      <Link>swagger-ui\lib\underscore-min.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\o2c.html">
+      <Link>swagger-ui\o2c.html</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\patch.js">
+      <Link>swagger-ui\patch.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\swagger-ui.js">
+      <Link>swagger-ui\swagger-ui.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\swagger-ui.min.js">
+      <Link>swagger-ui\swagger-ui.min.js</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <EmbeddedResource Include="Localization\countries.json" />
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-700.eot">
+      <Link>swagger-ui\fonts\droid-sans-v6-latin-700.eot</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-700.ttf">
+      <Link>swagger-ui\fonts\droid-sans-v6-latin-700.ttf</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-700.woff">
+      <Link>swagger-ui\fonts\droid-sans-v6-latin-700.woff</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-700.woff2">
+      <Link>swagger-ui\fonts\droid-sans-v6-latin-700.woff2</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-regular.eot">
+      <Link>swagger-ui\fonts\droid-sans-v6-latin-regular.eot</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-regular.ttf">
+      <Link>swagger-ui\fonts\droid-sans-v6-latin-regular.ttf</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-regular.woff">
+      <Link>swagger-ui\fonts\droid-sans-v6-latin-regular.woff</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-regular.woff2">
+      <Link>swagger-ui\fonts\droid-sans-v6-latin-regular.woff2</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="app.config" />
     <EmbeddedResource Include="Localization\Core\core.json" />
     <EmbeddedResource Include="Localization\Core\ar.json" />
@@ -607,10 +706,30 @@
     <EmbeddedResource Include="Localization\Ratings\ca.txt" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\css\reset.css">
+      <Link>swagger-ui\css\reset.css</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="..\ThirdParty\ServiceStack\swagger-ui\css\screen.css">
       <Link>swagger-ui\css\screen.css</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\css\typography.css">
+      <Link>swagger-ui\css\typography.css</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-700.svg">
+      <Link>swagger-ui\fonts\droid-sans-v6-latin-700.svg</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-regular.svg">
+      <Link>swagger-ui\fonts\droid-sans-v6-latin-regular.svg</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\images\explorer_icons.png">
+      <Link>swagger-ui\images\explorer_icons.png</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="..\ThirdParty\ServiceStack\swagger-ui\images\logo_small.png">
       <Link>swagger-ui\images\logo_small.png</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -631,58 +750,10 @@
       <Link>swagger-ui\index.html</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\backbone-min.js">
-      <Link>swagger-ui\lib\backbone-min.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\handlebars-1.0.0.js">
-      <Link>swagger-ui\lib\handlebars-1.0.0.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\highlight.7.3.pack.js">
-      <Link>swagger-ui\lib\highlight.7.3.pack.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\jquery-1.8.0.min.js">
-      <Link>swagger-ui\lib\jquery-1.8.0.min.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\jquery.ba-bbq.min.js">
-      <Link>swagger-ui\lib\jquery.ba-bbq.min.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\jquery.slideto.min.js">
-      <Link>swagger-ui\lib\jquery.slideto.min.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\jquery.wiggle.min.js">
-      <Link>swagger-ui\lib\jquery.wiggle.min.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\shred.bundle.js">
-      <Link>swagger-ui\lib\shred.bundle.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\shred\content.js">
       <Link>swagger-ui\lib\shred\content.js</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\swagger.js">
-      <Link>swagger-ui\lib\swagger.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\underscore-min.js">
-      <Link>swagger-ui\lib\underscore-min.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\swagger-ui.js">
-      <Link>swagger-ui\swagger-ui.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\swagger-ui.min.js">
-      <Link>swagger-ui\swagger-ui.min.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <EmbeddedResource Include="Localization\iso6392.txt" />
     <EmbeddedResource Include="Localization\Ratings\be.txt" />
   </ItemGroup>
diff --git a/MediaBrowser.Server.Implementations/Notifications/SqliteNotificationsRepository.cs b/MediaBrowser.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
index 10e8c5699..be8c6d48d 100644
--- a/MediaBrowser.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
+++ b/MediaBrowser.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
@@ -15,74 +15,28 @@ namespace MediaBrowser.Server.Implementations.Notifications
 {
     public class SqliteNotificationsRepository : BaseSqliteRepository, INotificationsRepository
     {
-        private IDbConnection _connection;
-        private readonly IServerApplicationPaths _appPaths;
+        public SqliteNotificationsRepository(ILogManager logManager, IServerApplicationPaths appPaths, IDbConnector dbConnector) : base(logManager, dbConnector)
+        {
+            DbFilePath = Path.Combine(appPaths.DataPath, "notifications.db");
+        }
 
         public event EventHandler<NotificationUpdateEventArgs> NotificationAdded;
         public event EventHandler<NotificationReadEventArgs> NotificationsMarkedRead;
         public event EventHandler<NotificationUpdateEventArgs> NotificationUpdated;
 
-        private IDbCommand _replaceNotificationCommand;
-        private IDbCommand _markReadCommand;
-        private IDbCommand _markAllReadCommand;
-
-        public SqliteNotificationsRepository(ILogManager logManager, IServerApplicationPaths appPaths)
-            : base(logManager)
+        public async Task Initialize()
         {
-            _appPaths = appPaths;
-        }
-
-        public async Task Initialize(IDbConnector dbConnector)
-        {
-            var dbFile = Path.Combine(_appPaths.DataPath, "notifications.db");
-
-            _connection = await dbConnector.Connect(dbFile).ConfigureAwait(false);
-
-            string[] queries = {
+            using (var connection = await CreateConnection().ConfigureAwait(false))
+            {
+                string[] queries = {
 
                                 "create table if not exists Notifications (Id GUID NOT NULL, UserId GUID NOT NULL, Date DATETIME NOT NULL, Name TEXT NOT NULL, Description TEXT, Url TEXT, Level TEXT NOT NULL, IsRead BOOLEAN NOT NULL, Category TEXT NOT NULL, RelatedId TEXT, PRIMARY KEY (Id, UserId))",
                                 "create index if not exists idx_Notifications1 on Notifications(Id)",
-                                "create index if not exists idx_Notifications2 on Notifications(UserId)",
-
-                                //pragmas
-                                "pragma temp_store = memory",
-
-                                "pragma shrink_memory"
+                                "create index if not exists idx_Notifications2 on Notifications(UserId)"
                                };
 
-            _connection.RunQueries(queries, Logger);
-
-            PrepareStatements();
-        }
-
-        private void PrepareStatements()
-        {
-            _replaceNotificationCommand = _connection.CreateCommand();
-            _replaceNotificationCommand.CommandText = "replace into Notifications (Id, UserId, Date, Name, Description, Url, Level, IsRead, Category, RelatedId) values (@Id, @UserId, @Date, @Name, @Description, @Url, @Level, @IsRead, @Category, @RelatedId)";
-
-            _replaceNotificationCommand.Parameters.Add(_replaceNotificationCommand, "@Id");
-            _replaceNotificationCommand.Parameters.Add(_replaceNotificationCommand, "@UserId");
-            _replaceNotificationCommand.Parameters.Add(_replaceNotificationCommand, "@Date");
-            _replaceNotificationCommand.Parameters.Add(_replaceNotificationCommand, "@Name");
-            _replaceNotificationCommand.Parameters.Add(_replaceNotificationCommand, "@Description");
-            _replaceNotificationCommand.Parameters.Add(_replaceNotificationCommand, "@Url");
-            _replaceNotificationCommand.Parameters.Add(_replaceNotificationCommand, "@Level");
-            _replaceNotificationCommand.Parameters.Add(_replaceNotificationCommand, "@IsRead");
-            _replaceNotificationCommand.Parameters.Add(_replaceNotificationCommand, "@Category");
-            _replaceNotificationCommand.Parameters.Add(_replaceNotificationCommand, "@RelatedId");
-
-            _markReadCommand = _connection.CreateCommand();
-            _markReadCommand.CommandText = "update Notifications set IsRead=@IsRead where Id=@Id and UserId=@UserId";
-
-            _markReadCommand.Parameters.Add(_replaceNotificationCommand, "@UserId");
-            _markReadCommand.Parameters.Add(_replaceNotificationCommand, "@IsRead");
-            _markReadCommand.Parameters.Add(_replaceNotificationCommand, "@Id");
-
-            _markAllReadCommand = _connection.CreateCommand();
-            _markAllReadCommand.CommandText = "update Notifications set IsRead=@IsRead where UserId=@UserId";
-
-            _markAllReadCommand.Parameters.Add(_replaceNotificationCommand, "@UserId");
-            _markAllReadCommand.Parameters.Add(_replaceNotificationCommand, "@IsRead");
+                connection.RunQueries(queries, Logger);
+            }
         }
 
         /// <summary>
@@ -94,49 +48,52 @@ namespace MediaBrowser.Server.Implementations.Notifications
         {
             var result = new NotificationResult();
 
-            using (var cmd = _connection.CreateCommand())
+            using (var connection = CreateConnection(true).Result)
             {
-                var clauses = new List<string>();
-
-                if (query.IsRead.HasValue)
+                using (var cmd = connection.CreateCommand())
                 {
-                    clauses.Add("IsRead=@IsRead");
-                    cmd.Parameters.Add(cmd, "@IsRead", DbType.Boolean).Value = query.IsRead.Value;
-                }
+                    var clauses = new List<string>();
 
-                clauses.Add("UserId=@UserId");
-                cmd.Parameters.Add(cmd, "@UserId", DbType.Guid).Value = new Guid(query.UserId);
+                    if (query.IsRead.HasValue)
+                    {
+                        clauses.Add("IsRead=@IsRead");
+                        cmd.Parameters.Add(cmd, "@IsRead", DbType.Boolean).Value = query.IsRead.Value;
+                    }
 
-                var whereClause = " where " + string.Join(" And ", clauses.ToArray());
+                    clauses.Add("UserId=@UserId");
+                    cmd.Parameters.Add(cmd, "@UserId", DbType.Guid).Value = new Guid(query.UserId);
 
-                cmd.CommandText = string.Format("select count(Id) from Notifications{0};select Id,UserId,Date,Name,Description,Url,Level,IsRead,Category,RelatedId from Notifications{0} order by IsRead asc, Date desc", whereClause);
+                    var whereClause = " where " + string.Join(" And ", clauses.ToArray());
 
-                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
-                {
-                    if (reader.Read())
-                    {
-                        result.TotalRecordCount = reader.GetInt32(0);
-                    }
+                    cmd.CommandText = string.Format("select count(Id) from Notifications{0};select Id,UserId,Date,Name,Description,Url,Level,IsRead,Category,RelatedId from Notifications{0} order by IsRead asc, Date desc", whereClause);
 
-                    if (reader.NextResult())
+                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
                     {
-                        var notifications = GetNotifications(reader);
-
-                        if (query.StartIndex.HasValue)
+                        if (reader.Read())
                         {
-                            notifications = notifications.Skip(query.StartIndex.Value);
+                            result.TotalRecordCount = reader.GetInt32(0);
                         }
 
-                        if (query.Limit.HasValue)
+                        if (reader.NextResult())
                         {
-                            notifications = notifications.Take(query.Limit.Value);
-                        }
+                            var notifications = GetNotifications(reader);
+
+                            if (query.StartIndex.HasValue)
+                            {
+                                notifications = notifications.Skip(query.StartIndex.Value);
+                            }
+
+                            if (query.Limit.HasValue)
+                            {
+                                notifications = notifications.Take(query.Limit.Value);
+                            }
 
-                        result.Notifications = notifications.ToArray();
+                            result.Notifications = notifications.ToArray();
+                        }
                     }
-                }
 
-                return result;
+                    return result;
+                }
             }
         }
 
@@ -144,31 +101,34 @@ namespace MediaBrowser.Server.Implementations.Notifications
         {
             var result = new NotificationsSummary();
 
-            using (var cmd = _connection.CreateCommand())
+            using (var connection = CreateConnection(true).Result)
             {
-                cmd.CommandText = "select Level from Notifications where UserId=@UserId and IsRead=@IsRead";
-
-                cmd.Parameters.Add(cmd, "@UserId", DbType.Guid).Value = new Guid(userId);
-                cmd.Parameters.Add(cmd, "@IsRead", DbType.Boolean).Value = false;
-
-                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
+                using (var cmd = connection.CreateCommand())
                 {
-                    var levels = new List<NotificationLevel>();
+                    cmd.CommandText = "select Level from Notifications where UserId=@UserId and IsRead=@IsRead";
 
-                    while (reader.Read())
+                    cmd.Parameters.Add(cmd, "@UserId", DbType.Guid).Value = new Guid(userId);
+                    cmd.Parameters.Add(cmd, "@IsRead", DbType.Boolean).Value = false;
+
+                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
                     {
-                        levels.Add(GetLevel(reader, 0));
-                    }
+                        var levels = new List<NotificationLevel>();
+
+                        while (reader.Read())
+                        {
+                            levels.Add(GetLevel(reader, 0));
+                        }
 
-                    result.UnreadCount = levels.Count;
+                        result.UnreadCount = levels.Count;
 
-                    if (levels.Count > 0)
-                    {
-                        result.MaxUnreadNotificationLevel = levels.Max();
+                        if (levels.Count > 0)
+                        {
+                            result.MaxUnreadNotificationLevel = levels.Max();
+                        }
                     }
-                }
 
-                return result;
+                    return result;
+                }
             }
         }
 
@@ -179,10 +139,14 @@ namespace MediaBrowser.Server.Implementations.Notifications
         /// <returns>IEnumerable{Notification}.</returns>
         private IEnumerable<Notification> GetNotifications(IDataReader reader)
         {
+            var list = new List<Notification>();
+
             while (reader.Read())
             {
-                yield return GetNotification(reader);
+                list.Add(GetNotification(reader));
             }
+
+            return list;
         }
 
         private Notification GetNotification(IDataReader reader)
@@ -273,59 +237,74 @@ namespace MediaBrowser.Server.Implementations.Notifications
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false);
-
-            IDbTransaction transaction = null;
-
-            try
+            using (var connection = await CreateConnection().ConfigureAwait(false))
             {
-                transaction = _connection.BeginTransaction();
+                using (var replaceNotificationCommand = connection.CreateCommand())
+                {
+                    replaceNotificationCommand.CommandText = "replace into Notifications (Id, UserId, Date, Name, Description, Url, Level, IsRead, Category, RelatedId) values (@Id, @UserId, @Date, @Name, @Description, @Url, @Level, @IsRead, @Category, @RelatedId)";
+
+                    replaceNotificationCommand.Parameters.Add(replaceNotificationCommand, "@Id");
+                    replaceNotificationCommand.Parameters.Add(replaceNotificationCommand, "@UserId");
+                    replaceNotificationCommand.Parameters.Add(replaceNotificationCommand, "@Date");
+                    replaceNotificationCommand.Parameters.Add(replaceNotificationCommand, "@Name");
+                    replaceNotificationCommand.Parameters.Add(replaceNotificationCommand, "@Description");
+                    replaceNotificationCommand.Parameters.Add(replaceNotificationCommand, "@Url");
+                    replaceNotificationCommand.Parameters.Add(replaceNotificationCommand, "@Level");
+                    replaceNotificationCommand.Parameters.Add(replaceNotificationCommand, "@IsRead");
+                    replaceNotificationCommand.Parameters.Add(replaceNotificationCommand, "@Category");
+                    replaceNotificationCommand.Parameters.Add(replaceNotificationCommand, "@RelatedId");
+
+                    IDbTransaction transaction = null;
+
+                    try
+                    {
+                        transaction = connection.BeginTransaction();
 
-                _replaceNotificationCommand.GetParameter(0).Value = new Guid(notification.Id);
-                _replaceNotificationCommand.GetParameter(1).Value = new Guid(notification.UserId);
-                _replaceNotificationCommand.GetParameter(2).Value = notification.Date.ToUniversalTime();
-                _replaceNotificationCommand.GetParameter(3).Value = notification.Name;
-                _replaceNotificationCommand.GetParameter(4).Value = notification.Description;
-                _replaceNotificationCommand.GetParameter(5).Value = notification.Url;
-                _replaceNotificationCommand.GetParameter(6).Value = notification.Level.ToString();
-                _replaceNotificationCommand.GetParameter(7).Value = notification.IsRead;
-                _replaceNotificationCommand.GetParameter(8).Value = string.Empty;
-                _replaceNotificationCommand.GetParameter(9).Value = string.Empty;
+                        replaceNotificationCommand.GetParameter(0).Value = new Guid(notification.Id);
+                        replaceNotificationCommand.GetParameter(1).Value = new Guid(notification.UserId);
+                        replaceNotificationCommand.GetParameter(2).Value = notification.Date.ToUniversalTime();
+                        replaceNotificationCommand.GetParameter(3).Value = notification.Name;
+                        replaceNotificationCommand.GetParameter(4).Value = notification.Description;
+                        replaceNotificationCommand.GetParameter(5).Value = notification.Url;
+                        replaceNotificationCommand.GetParameter(6).Value = notification.Level.ToString();
+                        replaceNotificationCommand.GetParameter(7).Value = notification.IsRead;
+                        replaceNotificationCommand.GetParameter(8).Value = string.Empty;
+                        replaceNotificationCommand.GetParameter(9).Value = string.Empty;
 
-                _replaceNotificationCommand.Transaction = transaction;
+                        replaceNotificationCommand.Transaction = transaction;
 
-                _replaceNotificationCommand.ExecuteNonQuery();
+                        replaceNotificationCommand.ExecuteNonQuery();
 
-                transaction.Commit();
-            }
-            catch (OperationCanceledException)
-            {
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
+                        transaction.Commit();
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
 
-                throw;
-            }
-            catch (Exception e)
-            {
-                Logger.ErrorException("Failed to save notification:", e);
+                        throw;
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.ErrorException("Failed to save notification:", e);
 
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
 
-                throw;
-            }
-            finally
-            {
-                if (transaction != null)
-                {
-                    transaction.Dispose();
+                        throw;
+                    }
+                    finally
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Dispose();
+                        }
+                    }
                 }
-
-                WriteLock.Release();
             }
         }
 
@@ -366,51 +345,58 @@ namespace MediaBrowser.Server.Implementations.Notifications
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false);
+            using (var connection = await CreateConnection().ConfigureAwait(false))
+            {
+                using (var markAllReadCommand = connection.CreateCommand())
+                {
+                    markAllReadCommand.CommandText = "update Notifications set IsRead=@IsRead where UserId=@UserId";
 
-            IDbTransaction transaction = null;
+                    markAllReadCommand.Parameters.Add(markAllReadCommand, "@UserId");
+                    markAllReadCommand.Parameters.Add(markAllReadCommand, "@IsRead");
 
-            try
-            {
-                cancellationToken.ThrowIfCancellationRequested();
+                    IDbTransaction transaction = null;
 
-                transaction = _connection.BeginTransaction();
+                    try
+                    {
+                        cancellationToken.ThrowIfCancellationRequested();
 
-                _markAllReadCommand.GetParameter(0).Value = new Guid(userId);
-                _markAllReadCommand.GetParameter(1).Value = isRead;
+                        transaction = connection.BeginTransaction();
 
-                _markAllReadCommand.ExecuteNonQuery();
+                        markAllReadCommand.GetParameter(0).Value = new Guid(userId);
+                        markAllReadCommand.GetParameter(1).Value = isRead;
 
-                transaction.Commit();
-            }
-            catch (OperationCanceledException)
-            {
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
+                        markAllReadCommand.ExecuteNonQuery();
 
-                throw;
-            }
-            catch (Exception e)
-            {
-                Logger.ErrorException("Failed to save notification:", e);
+                        transaction.Commit();
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
 
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
+                        throw;
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.ErrorException("Failed to save notification:", e);
 
-                throw;
-            }
-            finally
-            {
-                if (transaction != null)
-                {
-                    transaction.Dispose();
-                }
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
 
-                WriteLock.Release();
+                        throw;
+                    }
+                    finally
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Dispose();
+                        }
+                    }
+                }
             }
         }
 
@@ -418,72 +404,66 @@ namespace MediaBrowser.Server.Implementations.Notifications
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false);
-
-            IDbTransaction transaction = null;
-
-            try
+            using (var connection = await CreateConnection().ConfigureAwait(false))
             {
-                cancellationToken.ThrowIfCancellationRequested();
+                using (var markReadCommand = connection.CreateCommand())
+                {
+                    markReadCommand.CommandText = "update Notifications set IsRead=@IsRead where Id=@Id and UserId=@UserId";
 
-                transaction = _connection.BeginTransaction();
+                    markReadCommand.Parameters.Add(markReadCommand, "@UserId");
+                    markReadCommand.Parameters.Add(markReadCommand, "@IsRead");
+                    markReadCommand.Parameters.Add(markReadCommand, "@Id");
 
-                _markReadCommand.GetParameter(0).Value = new Guid(userId);
-                _markReadCommand.GetParameter(1).Value = isRead;
+                    IDbTransaction transaction = null;
 
-                foreach (var id in notificationIdList)
-                {
-                    _markReadCommand.GetParameter(2).Value = id;
+                    try
+                    {
+                        cancellationToken.ThrowIfCancellationRequested();
 
-                    _markReadCommand.Transaction = transaction;
+                        transaction = connection.BeginTransaction();
 
-                    _markReadCommand.ExecuteNonQuery();
-                }
+                        markReadCommand.GetParameter(0).Value = new Guid(userId);
+                        markReadCommand.GetParameter(1).Value = isRead;
 
-                transaction.Commit();
-            }
-            catch (OperationCanceledException)
-            {
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
+                        foreach (var id in notificationIdList)
+                        {
+                            markReadCommand.GetParameter(2).Value = id;
 
-                throw;
-            }
-            catch (Exception e)
-            {
-                Logger.ErrorException("Failed to save notification:", e);
+                            markReadCommand.Transaction = transaction;
 
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
+                            markReadCommand.ExecuteNonQuery();
+                        }
 
-                throw;
-            }
-            finally
-            {
-                if (transaction != null)
-                {
-                    transaction.Dispose();
-                }
+                        transaction.Commit();
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
 
-                WriteLock.Release();
-            }
-        }
+                        throw;
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.ErrorException("Failed to save notification:", e);
 
-        protected override void CloseConnection()
-        {
-            if (_connection != null)
-            {
-                if (_connection.IsOpen())
-                {
-                    _connection.Close();
-                }
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
 
-                _connection.Dispose();
-                _connection = null;
+                        throw;
+                    }
+                    finally
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Dispose();
+                        }
+                    }
+                }
             }
         }
     }
diff --git a/MediaBrowser.Server.Implementations/Persistence/BaseSqliteRepository.cs b/MediaBrowser.Server.Implementations/Persistence/BaseSqliteRepository.cs
index 395907844..233ab56fe 100644
--- a/MediaBrowser.Server.Implementations/Persistence/BaseSqliteRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/BaseSqliteRepository.cs
@@ -8,14 +8,36 @@ namespace MediaBrowser.Server.Implementations.Persistence
 {
     public abstract class BaseSqliteRepository : IDisposable
     {
-        protected readonly SemaphoreSlim WriteLock = new SemaphoreSlim(1, 1);
+        protected SemaphoreSlim WriteLock = new SemaphoreSlim(1, 1);
+        protected readonly IDbConnector DbConnector;
         protected ILogger Logger;
 
-        protected BaseSqliteRepository(ILogManager logManager)
+        protected string DbFilePath { get; set; }
+
+        protected BaseSqliteRepository(ILogManager logManager, IDbConnector dbConnector)
         {
+            DbConnector = dbConnector;
             Logger = logManager.GetLogger(GetType().Name);
         }
 
+        protected virtual bool EnableConnectionPooling
+        {
+            get { return true; }
+        }
+
+        protected virtual async Task<IDbConnection> CreateConnection(bool isReadOnly = false)
+        {
+            var connection = await DbConnector.Connect(DbFilePath, false, true).ConfigureAwait(false);
+
+            connection.RunQueries(new[]
+            {
+                "pragma temp_store = memory"
+
+            }, Logger);
+
+            return connection;
+        }
+
         private bool _disposed;
         protected void CheckDisposed()
         {
@@ -84,6 +106,9 @@ namespace MediaBrowser.Server.Implementations.Persistence
             }
         }
 
-        protected abstract void CloseConnection();
+        protected virtual void CloseConnection()
+        {
+
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
index 2a2f9a09d..b11a3e496 100644
--- a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
@@ -15,6 +15,7 @@ using System.Threading.Tasks;
 using CommonIO;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Server.Implementations.ScheduledTasks;
@@ -145,7 +146,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
         {
             var itemIds = _libraryManager.GetItemIds(new InternalItemsQuery
             {
-                IsCurrentSchema = false
+                IsCurrentSchema = false,
+                ExcludeItemTypes = new[] { typeof(LiveTvProgram).Name }
             });
 
             var numComplete = 0;
@@ -236,14 +238,14 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 // These have their own cleanup routines
                 ExcludeItemTypes = new[]
                 {
-                    typeof(Person).Name, 
-                    typeof(Genre).Name, 
-                    typeof(MusicGenre).Name, 
-                    typeof(GameGenre).Name, 
-                    typeof(Studio).Name, 
-                    typeof(Year).Name, 
-                    typeof(Channel).Name, 
-                    typeof(AggregateFolder).Name, 
+                    typeof(Person).Name,
+                    typeof(Genre).Name,
+                    typeof(MusicGenre).Name,
+                    typeof(GameGenre).Name,
+                    typeof(Studio).Name,
+                    typeof(Year).Name,
+                    typeof(Channel).Name,
+                    typeof(AggregateFolder).Name,
                     typeof(CollectionFolder).Name
                 }
             });
@@ -313,8 +315,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
         public IEnumerable<ITaskTrigger> GetDefaultTriggers()
         {
-            return new ITaskTrigger[] 
-            { 
+            return new ITaskTrigger[]
+            {
                 new IntervalTrigger{ Interval = TimeSpan.FromHours(24)}
             };
         }
diff --git a/MediaBrowser.Server.Implementations/Persistence/IDbConnector.cs b/MediaBrowser.Server.Implementations/Persistence/IDbConnector.cs
index cac9fe983..596cf8407 100644
--- a/MediaBrowser.Server.Implementations/Persistence/IDbConnector.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/IDbConnector.cs
@@ -5,6 +5,6 @@ namespace MediaBrowser.Server.Implementations.Persistence
 {
     public interface IDbConnector
     {
-        Task<IDbConnection> Connect(string dbPath);
+        Task<IDbConnection> Connect(string dbPath, bool isReadOnly, bool enablePooling = false, int? cacheSize = null);
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Persistence/MediaStreamColumns.cs b/MediaBrowser.Server.Implementations/Persistence/MediaStreamColumns.cs
index 948e99cb8..1d9be2e0d 100644
--- a/MediaBrowser.Server.Implementations/Persistence/MediaStreamColumns.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/MediaStreamColumns.cs
@@ -28,6 +28,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
             AddNalColumn();
             AddIsAvcColumn();
             AddTitleColumn();
+            AddTimeBaseColumn();
+            AddCodecTimeBaseColumn();
         }
 
         private void AddIsAvcColumn()
@@ -61,6 +63,68 @@ namespace MediaBrowser.Server.Implementations.Persistence
             _connection.RunQueries(new[] { builder.ToString() }, _logger);
         }
 
+        private void AddTimeBaseColumn()
+        {
+            using (var cmd = _connection.CreateCommand())
+            {
+                cmd.CommandText = "PRAGMA table_info(mediastreams)";
+
+                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult))
+                {
+                    while (reader.Read())
+                    {
+                        if (!reader.IsDBNull(1))
+                        {
+                            var name = reader.GetString(1);
+
+                            if (string.Equals(name, "TimeBase", StringComparison.OrdinalIgnoreCase))
+                            {
+                                return;
+                            }
+                        }
+                    }
+                }
+            }
+
+            var builder = new StringBuilder();
+
+            builder.AppendLine("alter table mediastreams");
+            builder.AppendLine("add column TimeBase TEXT");
+
+            _connection.RunQueries(new[] { builder.ToString() }, _logger);
+        }
+
+        private void AddCodecTimeBaseColumn()
+        {
+            using (var cmd = _connection.CreateCommand())
+            {
+                cmd.CommandText = "PRAGMA table_info(mediastreams)";
+
+                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult))
+                {
+                    while (reader.Read())
+                    {
+                        if (!reader.IsDBNull(1))
+                        {
+                            var name = reader.GetString(1);
+
+                            if (string.Equals(name, "CodecTimeBase", StringComparison.OrdinalIgnoreCase))
+                            {
+                                return;
+                            }
+                        }
+                    }
+                }
+            }
+
+            var builder = new StringBuilder();
+
+            builder.AppendLine("alter table mediastreams");
+            builder.AppendLine("add column CodecTimeBase TEXT");
+
+            _connection.RunQueries(new[] { builder.ToString() }, _logger);
+        }
+
         private void AddTitleColumn()
         {
             using (var cmd = _connection.CreateCommand())
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs
index 6077cfdba..40970dbe4 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs
@@ -18,12 +18,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
     /// </summary>
     public class SqliteDisplayPreferencesRepository : BaseSqliteRepository, IDisplayPreferencesRepository
     {
-        private IDbConnection _connection;
-
-        public SqliteDisplayPreferencesRepository(ILogManager logManager, IJsonSerializer jsonSerializer, IApplicationPaths appPaths) : base(logManager)
+        public SqliteDisplayPreferencesRepository(ILogManager logManager, IJsonSerializer jsonSerializer, IApplicationPaths appPaths, IDbConnector dbConnector)
+            : base(logManager, dbConnector)
         {
             _jsonSerializer = jsonSerializer;
-            _appPaths = appPaths;
+            DbFilePath = Path.Combine(appPaths.DataPath, "displaypreferences.db");
         }
 
         /// <summary>
@@ -44,32 +43,21 @@ namespace MediaBrowser.Server.Implementations.Persistence
         private readonly IJsonSerializer _jsonSerializer;
 
         /// <summary>
-        /// The _app paths
-        /// </summary>
-        private readonly IApplicationPaths _appPaths;
-
-        /// <summary>
         /// Opens the connection to the database
         /// </summary>
         /// <returns>Task.</returns>
-        public async Task Initialize(IDbConnector dbConnector)
+        public async Task Initialize()
         {
-            var dbFile = Path.Combine(_appPaths.DataPath, "displaypreferences.db");
-
-            _connection = await dbConnector.Connect(dbFile).ConfigureAwait(false);
-
-            string[] queries = {
+            using (var connection = await CreateConnection().ConfigureAwait(false))
+            {
+                string[] queries = {
 
                                 "create table if not exists userdisplaypreferences (id GUID, userId GUID, client text, data BLOB)",
-                                "create unique index if not exists userdisplaypreferencesindex on userdisplaypreferences (id, userId, client)",
-
-                                //pragmas
-                                "pragma temp_store = memory",
-
-                                "pragma shrink_memory"
+                                "create unique index if not exists userdisplaypreferencesindex on userdisplaypreferences (id, userId, client)"
                                };
 
-            _connection.RunQueries(queries, Logger);
+                connection.RunQueries(queries, Logger);
+            }
         }
 
         /// <summary>
@@ -96,58 +84,57 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             var serialized = _jsonSerializer.SerializeToBytes(displayPreferences);
 
-            await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false);
-
-            IDbTransaction transaction = null;
-
-            try
+            using (var connection = await CreateConnection().ConfigureAwait(false))
             {
-                transaction = _connection.BeginTransaction();
+                IDbTransaction transaction = null;
 
-                using (var cmd = _connection.CreateCommand())
+                try
                 {
-                    cmd.CommandText = "replace into userdisplaypreferences (id, userid, client, data) values (@1, @2, @3, @4)";
+                    transaction = connection.BeginTransaction();
 
-                    cmd.Parameters.Add(cmd, "@1", DbType.Guid).Value = new Guid(displayPreferences.Id);
-                    cmd.Parameters.Add(cmd, "@2", DbType.Guid).Value = userId;
-                    cmd.Parameters.Add(cmd, "@3", DbType.String).Value = client;
-                    cmd.Parameters.Add(cmd, "@4", DbType.Binary).Value = serialized;
+                    using (var cmd = connection.CreateCommand())
+                    {
+                        cmd.CommandText = "replace into userdisplaypreferences (id, userid, client, data) values (@1, @2, @3, @4)";
 
-                    cmd.Transaction = transaction;
+                        cmd.Parameters.Add(cmd, "@1", DbType.Guid).Value = new Guid(displayPreferences.Id);
+                        cmd.Parameters.Add(cmd, "@2", DbType.Guid).Value = userId;
+                        cmd.Parameters.Add(cmd, "@3", DbType.String).Value = client;
+                        cmd.Parameters.Add(cmd, "@4", DbType.Binary).Value = serialized;
 
-                    cmd.ExecuteNonQuery();
-                }
+                        cmd.Transaction = transaction;
 
-                transaction.Commit();
-            }
-            catch (OperationCanceledException)
-            {
-                if (transaction != null)
+                        cmd.ExecuteNonQuery();
+                    }
+
+                    transaction.Commit();
+                }
+                catch (OperationCanceledException)
                 {
-                    transaction.Rollback();
+                    if (transaction != null)
+                    {
+                        transaction.Rollback();
+                    }
+
+                    throw;
                 }
+                catch (Exception e)
+                {
+                    Logger.ErrorException("Failed to save display preferences:", e);
 
-                throw;
-            }
-            catch (Exception e)
-            {
-                Logger.ErrorException("Failed to save display preferences:", e);
+                    if (transaction != null)
+                    {
+                        transaction.Rollback();
+                    }
 
-                if (transaction != null)
-                {
-                    transaction.Rollback();
+                    throw;
                 }
-
-                throw;
-            }
-            finally
-            {
-                if (transaction != null)
+                finally
                 {
-                    transaction.Dispose();
+                    if (transaction != null)
+                    {
+                        transaction.Dispose();
+                    }
                 }
-
-                WriteLock.Release();
             }
         }
 
@@ -168,64 +155,63 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false);
-
-            IDbTransaction transaction = null;
-
-            try
+            using (var connection = await CreateConnection().ConfigureAwait(false))
             {
-                transaction = _connection.BeginTransaction();
+                IDbTransaction transaction = null;
 
-                foreach (var displayPreference in displayPreferences)
+                try
                 {
+                    transaction = connection.BeginTransaction();
 
-                    var serialized = _jsonSerializer.SerializeToBytes(displayPreference);
-
-                    using (var cmd = _connection.CreateCommand())
+                    foreach (var displayPreference in displayPreferences)
                     {
-                        cmd.CommandText = "replace into userdisplaypreferences (id, userid, client, data) values (@1, @2, @3, @4)";
 
-                        cmd.Parameters.Add(cmd, "@1", DbType.Guid).Value = new Guid(displayPreference.Id);
-                        cmd.Parameters.Add(cmd, "@2", DbType.Guid).Value = userId;
-                        cmd.Parameters.Add(cmd, "@3", DbType.String).Value = displayPreference.Client;
-                        cmd.Parameters.Add(cmd, "@4", DbType.Binary).Value = serialized;
+                        var serialized = _jsonSerializer.SerializeToBytes(displayPreference);
 
-                        cmd.Transaction = transaction;
+                        using (var cmd = connection.CreateCommand())
+                        {
+                            cmd.CommandText = "replace into userdisplaypreferences (id, userid, client, data) values (@1, @2, @3, @4)";
 
-                        cmd.ExecuteNonQuery();
+                            cmd.Parameters.Add(cmd, "@1", DbType.Guid).Value = new Guid(displayPreference.Id);
+                            cmd.Parameters.Add(cmd, "@2", DbType.Guid).Value = userId;
+                            cmd.Parameters.Add(cmd, "@3", DbType.String).Value = displayPreference.Client;
+                            cmd.Parameters.Add(cmd, "@4", DbType.Binary).Value = serialized;
+
+                            cmd.Transaction = transaction;
+
+                            cmd.ExecuteNonQuery();
+                        }
                     }
-                }
 
-                transaction.Commit();
-            }
-            catch (OperationCanceledException)
-            {
-                if (transaction != null)
+                    transaction.Commit();
+                }
+                catch (OperationCanceledException)
                 {
-                    transaction.Rollback();
+                    if (transaction != null)
+                    {
+                        transaction.Rollback();
+                    }
+
+                    throw;
                 }
+                catch (Exception e)
+                {
+                    Logger.ErrorException("Failed to save display preferences:", e);
 
-                throw;
-            }
-            catch (Exception e)
-            {
-                Logger.ErrorException("Failed to save display preferences:", e);
+                    if (transaction != null)
+                    {
+                        transaction.Rollback();
+                    }
 
-                if (transaction != null)
-                {
-                    transaction.Rollback();
+                    throw;
                 }
-
-                throw;
-            }
-            finally
-            {
-                if (transaction != null)
+                finally
                 {
-                    transaction.Dispose();
+                    if (transaction != null)
+                    {
+                        transaction.Dispose();
+                    }
                 }
-
-                WriteLock.Release();
             }
         }
 
@@ -246,28 +232,33 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             var guidId = displayPreferencesId.GetMD5();
 
-            var cmd = _connection.CreateCommand();
-            cmd.CommandText = "select data from userdisplaypreferences where id = @id and userId=@userId and client=@client";
-
-            cmd.Parameters.Add(cmd, "@id", DbType.Guid).Value = guidId;
-            cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId;
-            cmd.Parameters.Add(cmd, "@client", DbType.String).Value = client;
-
-            using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
+            using (var connection = CreateConnection(true).Result)
             {
-                if (reader.Read())
+                using (var cmd = connection.CreateCommand())
                 {
-                    using (var stream = reader.GetMemoryStream(0))
+                    cmd.CommandText = "select data from userdisplaypreferences where id = @id and userId=@userId and client=@client";
+
+                    cmd.Parameters.Add(cmd, "@id", DbType.Guid).Value = guidId;
+                    cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId;
+                    cmd.Parameters.Add(cmd, "@client", DbType.String).Value = client;
+
+                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
                     {
-                        return _jsonSerializer.DeserializeFromStream<DisplayPreferences>(stream);
+                        if (reader.Read())
+                        {
+                            using (var stream = reader.GetMemoryStream(0))
+                            {
+                                return _jsonSerializer.DeserializeFromStream<DisplayPreferences>(stream);
+                            }
+                        }
                     }
+
+                    return new DisplayPreferences
+                    {
+                        Id = guidId.ToString("N")
+                    };
                 }
             }
-
-            return new DisplayPreferences
-            {
-                Id = guidId.ToString("N")
-            };
         }
 
         /// <summary>
@@ -278,36 +269,30 @@ namespace MediaBrowser.Server.Implementations.Persistence
         /// <exception cref="System.ArgumentNullException">item</exception>
         public IEnumerable<DisplayPreferences> GetAllDisplayPreferences(Guid userId)
         {
+            var list = new List<DisplayPreferences>();
 
-            var cmd = _connection.CreateCommand();
-            cmd.CommandText = "select data from userdisplaypreferences where userId=@userId";
-
-            cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId;
-
-            using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult))
+            using (var connection = CreateConnection(true).Result)
             {
-                while (reader.Read())
+                using (var cmd = connection.CreateCommand())
                 {
-                    using (var stream = reader.GetMemoryStream(0))
+                    cmd.CommandText = "select data from userdisplaypreferences where userId=@userId";
+
+                    cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId;
+
+                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult))
                     {
-                        yield return _jsonSerializer.DeserializeFromStream<DisplayPreferences>(stream);
+                        while (reader.Read())
+                        {
+                            using (var stream = reader.GetMemoryStream(0))
+                            {
+                                list.Add(_jsonSerializer.DeserializeFromStream<DisplayPreferences>(stream));
+                            }
+                        }
                     }
                 }
             }
-        }
-
-        protected override void CloseConnection()
-        {
-            if (_connection != null)
-            {
-                if (_connection.IsOpen())
-                {
-                    _connection.Close();
-                }
 
-                _connection.Dispose();
-                _connection = null;
-            }
+            return list;
         }
 
         public Task SaveDisplayPreferences(DisplayPreferences displayPreferences, string userId, string client, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs
new file mode 100644
index 000000000..d5b582da5
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SQLite;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Logging;
+
+namespace MediaBrowser.Server.Implementations.Persistence
+{
+    /// <summary>
+    /// Class SQLiteExtensions
+    /// </summary>
+    public static class SqliteExtensions
+    {
+        /// <summary>
+        /// Connects to db.
+        /// </summary>
+        public static async Task<IDbConnection> ConnectToDb(string dbPath, bool isReadOnly, bool enablePooling, int? cacheSize, ILogger logger)
+        {
+            if (string.IsNullOrEmpty(dbPath))
+            {
+                throw new ArgumentNullException("dbPath");
+            }
+
+            SQLiteConnection.SetMemoryStatus(false);
+
+            var connectionstr = new SQLiteConnectionStringBuilder
+            {
+                PageSize = 4096,
+                CacheSize = cacheSize ?? 2000,
+                SyncMode = SynchronizationModes.Normal,
+                DataSource = dbPath,
+                JournalMode = SQLiteJournalModeEnum.Wal,
+
+                // This is causing crashing under linux
+                Pooling = enablePooling && Environment.OSVersion.Platform == PlatformID.Win32NT,
+                ReadOnly = isReadOnly
+            };
+
+            var connectionString = connectionstr.ConnectionString;
+
+            if (!enablePooling)
+            {
+                logger.Info("Sqlite {0} opening {1}", SQLiteConnection.SQLiteVersion, connectionString);
+            }
+
+            var connection = new SQLiteConnection(connectionString);
+
+            await connection.OpenAsync().ConfigureAwait(false);
+
+            return connection;
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteFileOrganizationRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteFileOrganizationRepository.cs
index 037776997..7a5e00090 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteFileOrganizationRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteFileOrganizationRepository.cs
@@ -16,74 +16,29 @@ namespace MediaBrowser.Server.Implementations.Persistence
 {
     public class SqliteFileOrganizationRepository : BaseSqliteRepository, IFileOrganizationRepository, IDisposable
     {
-        private IDbConnection _connection;
-
-        private readonly IServerApplicationPaths _appPaths;
-
         private readonly CultureInfo _usCulture = new CultureInfo("en-US");
 
-        private IDbCommand _saveResultCommand;
-        private IDbCommand _deleteResultCommand;
-        private IDbCommand _deleteAllCommand;
-
-        public SqliteFileOrganizationRepository(ILogManager logManager, IServerApplicationPaths appPaths) : base(logManager)
+        public SqliteFileOrganizationRepository(ILogManager logManager, IServerApplicationPaths appPaths, IDbConnector connector) : base(logManager, connector)
         {
-            _appPaths = appPaths;
+            DbFilePath = Path.Combine(appPaths.DataPath, "fileorganization.db");
         }
 
         /// <summary>
         /// Opens the connection to the database
         /// </summary>
         /// <returns>Task.</returns>
-        public async Task Initialize(IDbConnector dbConnector)
+        public async Task Initialize()
         {
-            var dbFile = Path.Combine(_appPaths.DataPath, "fileorganization.db");
-
-            _connection = await dbConnector.Connect(dbFile).ConfigureAwait(false);
-
-            string[] queries = {
+            using (var connection = await CreateConnection().ConfigureAwait(false))
+            {
+                string[] queries = {
 
                                 "create table if not exists FileOrganizerResults (ResultId GUID PRIMARY KEY, OriginalPath TEXT, TargetPath TEXT, FileLength INT, OrganizationDate datetime, Status TEXT, OrganizationType TEXT, StatusMessage TEXT, ExtractedName TEXT, ExtractedYear int null, ExtractedSeasonNumber int null, ExtractedEpisodeNumber int null, ExtractedEndingEpisodeNumber, DuplicatePaths TEXT int null)",
-                                "create index if not exists idx_FileOrganizerResults on FileOrganizerResults(ResultId)",
-
-                                //pragmas
-                                "pragma temp_store = memory",
-
-                                "pragma shrink_memory"
+                                "create index if not exists idx_FileOrganizerResults on FileOrganizerResults(ResultId)"
                                };
 
-            _connection.RunQueries(queries, Logger);
-
-            PrepareStatements();
-        }
-
-        private void PrepareStatements()
-        {
-            _saveResultCommand = _connection.CreateCommand();
-            _saveResultCommand.CommandText = "replace into FileOrganizerResults (ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths) values (@ResultId, @OriginalPath, @TargetPath, @FileLength, @OrganizationDate, @Status, @OrganizationType, @StatusMessage, @ExtractedName, @ExtractedYear, @ExtractedSeasonNumber, @ExtractedEpisodeNumber, @ExtractedEndingEpisodeNumber, @DuplicatePaths)";
-
-            _saveResultCommand.Parameters.Add(_saveResultCommand, "@ResultId");
-            _saveResultCommand.Parameters.Add(_saveResultCommand, "@OriginalPath");
-            _saveResultCommand.Parameters.Add(_saveResultCommand, "@TargetPath");
-            _saveResultCommand.Parameters.Add(_saveResultCommand, "@FileLength");
-            _saveResultCommand.Parameters.Add(_saveResultCommand, "@OrganizationDate");
-            _saveResultCommand.Parameters.Add(_saveResultCommand, "@Status");
-            _saveResultCommand.Parameters.Add(_saveResultCommand, "@OrganizationType");
-            _saveResultCommand.Parameters.Add(_saveResultCommand, "@StatusMessage");
-            _saveResultCommand.Parameters.Add(_saveResultCommand, "@ExtractedName");
-            _saveResultCommand.Parameters.Add(_saveResultCommand, "@ExtractedYear");
-            _saveResultCommand.Parameters.Add(_saveResultCommand, "@ExtractedSeasonNumber");
-            _saveResultCommand.Parameters.Add(_saveResultCommand, "@ExtractedEpisodeNumber");
-            _saveResultCommand.Parameters.Add(_saveResultCommand, "@ExtractedEndingEpisodeNumber");
-            _saveResultCommand.Parameters.Add(_saveResultCommand, "@DuplicatePaths");
-
-            _deleteResultCommand = _connection.CreateCommand();
-            _deleteResultCommand.CommandText = "delete from FileOrganizerResults where ResultId = @ResultId";
-
-            _deleteResultCommand.Parameters.Add(_saveResultCommand, "@ResultId");
-
-            _deleteAllCommand = _connection.CreateCommand();
-            _deleteAllCommand.CommandText = "delete from FileOrganizerResults";
+                connection.RunQueries(queries, Logger);
+            }
         }
 
         public async Task SaveResult(FileOrganizationResult result, CancellationToken cancellationToken)
@@ -95,65 +50,84 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false);
-
-            IDbTransaction transaction = null;
-
-            try
-            {
-                transaction = _connection.BeginTransaction();
-
-                var index = 0;
-
-                _saveResultCommand.GetParameter(index++).Value = new Guid(result.Id);
-                _saveResultCommand.GetParameter(index++).Value = result.OriginalPath;
-                _saveResultCommand.GetParameter(index++).Value = result.TargetPath;
-                _saveResultCommand.GetParameter(index++).Value = result.FileSize;
-                _saveResultCommand.GetParameter(index++).Value = result.Date;
-                _saveResultCommand.GetParameter(index++).Value = result.Status.ToString();
-                _saveResultCommand.GetParameter(index++).Value = result.Type.ToString();
-                _saveResultCommand.GetParameter(index++).Value = result.StatusMessage;
-                _saveResultCommand.GetParameter(index++).Value = result.ExtractedName;
-                _saveResultCommand.GetParameter(index++).Value = result.ExtractedYear;
-                _saveResultCommand.GetParameter(index++).Value = result.ExtractedSeasonNumber;
-                _saveResultCommand.GetParameter(index++).Value = result.ExtractedEpisodeNumber;
-                _saveResultCommand.GetParameter(index++).Value = result.ExtractedEndingEpisodeNumber;
-                _saveResultCommand.GetParameter(index).Value = string.Join("|", result.DuplicatePaths.ToArray());
-
-                _saveResultCommand.Transaction = transaction;
-
-                _saveResultCommand.ExecuteNonQuery();
-
-                transaction.Commit();
-            }
-            catch (OperationCanceledException)
+            using (var connection = await CreateConnection().ConfigureAwait(false))
             {
-                if (transaction != null)
+                using (var saveResultCommand = connection.CreateCommand())
                 {
-                    transaction.Rollback();
-                }
+                    saveResultCommand.CommandText = "replace into FileOrganizerResults (ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths) values (@ResultId, @OriginalPath, @TargetPath, @FileLength, @OrganizationDate, @Status, @OrganizationType, @StatusMessage, @ExtractedName, @ExtractedYear, @ExtractedSeasonNumber, @ExtractedEpisodeNumber, @ExtractedEndingEpisodeNumber, @DuplicatePaths)";
+
+                    saveResultCommand.Parameters.Add(saveResultCommand, "@ResultId");
+                    saveResultCommand.Parameters.Add(saveResultCommand, "@OriginalPath");
+                    saveResultCommand.Parameters.Add(saveResultCommand, "@TargetPath");
+                    saveResultCommand.Parameters.Add(saveResultCommand, "@FileLength");
+                    saveResultCommand.Parameters.Add(saveResultCommand, "@OrganizationDate");
+                    saveResultCommand.Parameters.Add(saveResultCommand, "@Status");
+                    saveResultCommand.Parameters.Add(saveResultCommand, "@OrganizationType");
+                    saveResultCommand.Parameters.Add(saveResultCommand, "@StatusMessage");
+                    saveResultCommand.Parameters.Add(saveResultCommand, "@ExtractedName");
+                    saveResultCommand.Parameters.Add(saveResultCommand, "@ExtractedYear");
+                    saveResultCommand.Parameters.Add(saveResultCommand, "@ExtractedSeasonNumber");
+                    saveResultCommand.Parameters.Add(saveResultCommand, "@ExtractedEpisodeNumber");
+                    saveResultCommand.Parameters.Add(saveResultCommand, "@ExtractedEndingEpisodeNumber");
+                    saveResultCommand.Parameters.Add(saveResultCommand, "@DuplicatePaths");
+
+                    IDbTransaction transaction = null;
+
+                    try
+                    {
+                        transaction = connection.BeginTransaction();
+
+                        var index = 0;
+
+                        saveResultCommand.GetParameter(index++).Value = new Guid(result.Id);
+                        saveResultCommand.GetParameter(index++).Value = result.OriginalPath;
+                        saveResultCommand.GetParameter(index++).Value = result.TargetPath;
+                        saveResultCommand.GetParameter(index++).Value = result.FileSize;
+                        saveResultCommand.GetParameter(index++).Value = result.Date;
+                        saveResultCommand.GetParameter(index++).Value = result.Status.ToString();
+                        saveResultCommand.GetParameter(index++).Value = result.Type.ToString();
+                        saveResultCommand.GetParameter(index++).Value = result.StatusMessage;
+                        saveResultCommand.GetParameter(index++).Value = result.ExtractedName;
+                        saveResultCommand.GetParameter(index++).Value = result.ExtractedYear;
+                        saveResultCommand.GetParameter(index++).Value = result.ExtractedSeasonNumber;
+                        saveResultCommand.GetParameter(index++).Value = result.ExtractedEpisodeNumber;
+                        saveResultCommand.GetParameter(index++).Value = result.ExtractedEndingEpisodeNumber;
+                        saveResultCommand.GetParameter(index).Value = string.Join("|", result.DuplicatePaths.ToArray());
+
+                        saveResultCommand.Transaction = transaction;
+
+                        saveResultCommand.ExecuteNonQuery();
+
+                        transaction.Commit();
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
 
-                throw;
-            }
-            catch (Exception e)
-            {
-                Logger.ErrorException("Failed to save FileOrganizationResult:", e);
+                        throw;
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.ErrorException("Failed to save FileOrganizationResult:", e);
 
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
 
-                throw;
-            }
-            finally
-            {
-                if (transaction != null)
-                {
-                    transaction.Dispose();
+                        throw;
+                    }
+                    finally
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Dispose();
+                        }
+                    }
                 }
-
-                WriteLock.Release();
             }
         }
 
@@ -164,100 +138,110 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 throw new ArgumentNullException("id");
             }
 
-            await WriteLock.WaitAsync().ConfigureAwait(false);
+            using (var connection = await CreateConnection().ConfigureAwait(false))
+            {
+                using (var deleteResultCommand = connection.CreateCommand())
+                {
+                    deleteResultCommand.CommandText = "delete from FileOrganizerResults where ResultId = @ResultId";
 
-            IDbTransaction transaction = null;
+                    deleteResultCommand.Parameters.Add(deleteResultCommand, "@ResultId");
 
-            try
-            {
-                transaction = _connection.BeginTransaction();
+                    IDbTransaction transaction = null;
 
-                _deleteResultCommand.GetParameter(0).Value = new Guid(id);
+                    try
+                    {
+                        transaction = connection.BeginTransaction();
 
-                _deleteResultCommand.Transaction = transaction;
+                        deleteResultCommand.GetParameter(0).Value = new Guid(id);
 
-                _deleteResultCommand.ExecuteNonQuery();
+                        deleteResultCommand.Transaction = transaction;
 
-                transaction.Commit();
-            }
-            catch (OperationCanceledException)
-            {
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
+                        deleteResultCommand.ExecuteNonQuery();
 
-                throw;
-            }
-            catch (Exception e)
-            {
-                Logger.ErrorException("Failed to delete FileOrganizationResult:", e);
+                        transaction.Commit();
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
 
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
+                        throw;
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.ErrorException("Failed to delete FileOrganizationResult:", e);
 
-                throw;
-            }
-            finally
-            {
-                if (transaction != null)
-                {
-                    transaction.Dispose();
-                }
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
 
-                WriteLock.Release();
+                        throw;
+                    }
+                    finally
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Dispose();
+                        }
+                    }
+                }
             }
         }
 
         public async Task DeleteAll()
         {
-            await WriteLock.WaitAsync().ConfigureAwait(false);
+            using (var connection = await CreateConnection().ConfigureAwait(false))
+            {
+                using (var cmd = connection.CreateCommand())
+                {
+                    cmd.CommandText = "delete from FileOrganizerResults";
 
-            IDbTransaction transaction = null;
+                    IDbTransaction transaction = null;
 
-            try
-            {
-                transaction = _connection.BeginTransaction();
-                
-                _deleteAllCommand.Transaction = transaction;
+                    try
+                    {
+                        transaction = connection.BeginTransaction();
 
-                _deleteAllCommand.ExecuteNonQuery();
+                        cmd.Transaction = transaction;
 
-                transaction.Commit();
-            }
-            catch (OperationCanceledException)
-            {
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
+                        cmd.ExecuteNonQuery();
 
-                throw;
-            }
-            catch (Exception e)
-            {
-                Logger.ErrorException("Failed to delete results", e);
+                        transaction.Commit();
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
 
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
+                        throw;
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.ErrorException("Failed to delete results", e);
 
-                throw;
-            }
-            finally
-            {
-                if (transaction != null)
-                {
-                    transaction.Dispose();
-                }
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
 
-                WriteLock.Release();
+                        throw;
+                    }
+                    finally
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Dispose();
+                        }
+                    }
+                }
             }
         }
-        
+
         public QueryResult<FileOrganizationResult> GetResults(FileOrganizationResultQuery query)
         {
             if (query == null)
@@ -265,46 +249,49 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 throw new ArgumentNullException("query");
             }
 
-            using (var cmd = _connection.CreateCommand())
+            using (var connection = CreateConnection(true).Result)
             {
-                cmd.CommandText = "SELECT ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths from FileOrganizerResults";
-
-                if (query.StartIndex.HasValue && query.StartIndex.Value > 0)
+                using (var cmd = connection.CreateCommand())
                 {
-                    cmd.CommandText += string.Format(" WHERE ResultId NOT IN (SELECT ResultId FROM FileOrganizerResults ORDER BY OrganizationDate desc LIMIT {0})",
-                        query.StartIndex.Value.ToString(_usCulture));
-                }
+                    cmd.CommandText = "SELECT ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths from FileOrganizerResults";
 
-                cmd.CommandText += " ORDER BY OrganizationDate desc";
+                    if (query.StartIndex.HasValue && query.StartIndex.Value > 0)
+                    {
+                        cmd.CommandText += string.Format(" WHERE ResultId NOT IN (SELECT ResultId FROM FileOrganizerResults ORDER BY OrganizationDate desc LIMIT {0})",
+                            query.StartIndex.Value.ToString(_usCulture));
+                    }
 
-                if (query.Limit.HasValue)
-                {
-                    cmd.CommandText += " LIMIT " + query.Limit.Value.ToString(_usCulture);
-                }
+                    cmd.CommandText += " ORDER BY OrganizationDate desc";
+
+                    if (query.Limit.HasValue)
+                    {
+                        cmd.CommandText += " LIMIT " + query.Limit.Value.ToString(_usCulture);
+                    }
 
-                cmd.CommandText += "; select count (ResultId) from FileOrganizerResults";
+                    cmd.CommandText += "; select count (ResultId) from FileOrganizerResults";
 
-                var list = new List<FileOrganizationResult>();
-                var count = 0;
+                    var list = new List<FileOrganizationResult>();
+                    var count = 0;
 
-                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
-                {
-                    while (reader.Read())
+                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
                     {
-                        list.Add(GetResult(reader));
+                        while (reader.Read())
+                        {
+                            list.Add(GetResult(reader));
+                        }
+
+                        if (reader.NextResult() && reader.Read())
+                        {
+                            count = reader.GetInt32(0);
+                        }
                     }
 
-                    if (reader.NextResult() && reader.Read())
+                    return new QueryResult<FileOrganizationResult>()
                     {
-                        count = reader.GetInt32(0);
-                    }
+                        Items = list.ToArray(),
+                        TotalRecordCount = count
+                    };
                 }
-
-                return new QueryResult<FileOrganizationResult>()
-                {
-                    Items = list.ToArray(),
-                    TotalRecordCount = count
-                };
             }
         }
 
@@ -315,24 +302,27 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 throw new ArgumentNullException("id");
             }
 
-            var guid = new Guid(id);
-
-            using (var cmd = _connection.CreateCommand())
+            using (var connection = CreateConnection(true).Result)
             {
-                cmd.CommandText = "select ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths from FileOrganizerResults where ResultId=@Id";
+                var guid = new Guid(id);
 
-                cmd.Parameters.Add(cmd, "@Id", DbType.Guid).Value = guid;
-
-                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
+                using (var cmd = connection.CreateCommand())
                 {
-                    if (reader.Read())
+                    cmd.CommandText = "select ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths from FileOrganizerResults where ResultId=@Id";
+
+                    cmd.Parameters.Add(cmd, "@Id", DbType.Guid).Value = guid;
+
+                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
                     {
-                        return GetResult(reader);
+                        if (reader.Read())
+                        {
+                            return GetResult(reader);
+                        }
                     }
                 }
-            }
 
-            return null;
+                return null;
+            }
         }
 
         public FileOrganizationResult GetResult(IDataReader reader)
@@ -414,19 +404,5 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             return result;
         }
-
-        protected override void CloseConnection()
-        {
-            if (_connection != null)
-            {
-                if (_connection.IsOpen())
-                {
-                    _connection.Close();
-                }
-
-                _connection.Dispose();
-                _connection = null;
-            }
-        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 57eb41bc2..5d017880c 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -15,12 +15,14 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Runtime.Serialization;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Playlists;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.LiveTv;
 
 namespace MediaBrowser.Server.Implementations.Persistence
@@ -84,16 +86,22 @@ namespace MediaBrowser.Server.Implementations.Persistence
         private IDbCommand _deleteItemValuesCommand;
         private IDbCommand _saveItemValuesCommand;
 
+        private IDbCommand _deleteProviderIdsCommand;
+        private IDbCommand _saveProviderIdsCommand;
+
+        private IDbCommand _deleteImagesCommand;
+        private IDbCommand _saveImagesCommand;
+
         private IDbCommand _updateInheritedRatingCommand;
         private IDbCommand _updateInheritedTagsCommand;
 
-        public const int LatestSchemaVersion = 79;
+        public const int LatestSchemaVersion = 97;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.
         /// </summary>
-        public SqliteItemRepository(IServerConfigurationManager config, IJsonSerializer jsonSerializer, ILogManager logManager)
-            : base(logManager)
+        public SqliteItemRepository(IServerConfigurationManager config, IJsonSerializer jsonSerializer, ILogManager logManager, IDbConnector connector)
+            : base(logManager, connector)
         {
             if (config == null)
             {
@@ -108,27 +116,40 @@ namespace MediaBrowser.Server.Implementations.Persistence
             _jsonSerializer = jsonSerializer;
 
             _criticReviewsPath = Path.Combine(_config.ApplicationPaths.DataPath, "critic-reviews");
+            DbFilePath = Path.Combine(_config.ApplicationPaths.DataPath, "library.db");
         }
 
         private const string ChaptersTableName = "Chapters2";
 
+        protected override async Task<IDbConnection> CreateConnection(bool isReadOnly = false)
+        {
+            var connection = await DbConnector.Connect(DbFilePath, false, false, _config.Configuration.SqliteCachePages).ConfigureAwait(false);
+
+            connection.RunQueries(new[]
+            {
+                "pragma temp_store = memory",
+                "pragma default_temp_store = memory",
+                "PRAGMA locking_mode=EXCLUSIVE"
+
+            }, Logger);
+
+            return connection;
+        }
+
         /// <summary>
         /// Opens the connection to the database
         /// </summary>
         /// <returns>Task.</returns>
-        public async Task Initialize(IDbConnector dbConnector)
+        public async Task Initialize(SqliteUserDataRepository userDataRepo)
         {
-            var dbFile = Path.Combine(_config.ApplicationPaths.DataPath, "library.db");
-
-            _connection = await dbConnector.Connect(dbFile).ConfigureAwait(false);
+            _connection = await CreateConnection(false).ConfigureAwait(false);
 
             var createMediaStreamsTableCommand
-               = "create table if not exists mediastreams (ItemId GUID, StreamIndex INT, StreamType TEXT, Codec TEXT, Language TEXT, ChannelLayout TEXT, Profile TEXT, AspectRatio TEXT, Path TEXT, IsInterlaced BIT, BitRate INT NULL, Channels INT NULL, SampleRate INT NULL, IsDefault BIT, IsForced BIT, IsExternal BIT, Height INT NULL, Width INT NULL, AverageFrameRate FLOAT NULL, RealFrameRate FLOAT NULL, Level FLOAT NULL, PixelFormat TEXT, BitDepth INT NULL, IsAnamorphic BIT NULL, RefFrames INT NULL, CodecTag TEXT NULL, Comment TEXT NULL, NalLengthSize TEXT NULL, IsAvc BIT NULL, Title TEXT NULL, PRIMARY KEY (ItemId, StreamIndex))";
+               = "create table if not exists mediastreams (ItemId GUID, StreamIndex INT, StreamType TEXT, Codec TEXT, Language TEXT, ChannelLayout TEXT, Profile TEXT, AspectRatio TEXT, Path TEXT, IsInterlaced BIT, BitRate INT NULL, Channels INT NULL, SampleRate INT NULL, IsDefault BIT, IsForced BIT, IsExternal BIT, Height INT NULL, Width INT NULL, AverageFrameRate FLOAT NULL, RealFrameRate FLOAT NULL, Level FLOAT NULL, PixelFormat TEXT, BitDepth INT NULL, IsAnamorphic BIT NULL, RefFrames INT NULL, CodecTag TEXT NULL, Comment TEXT NULL, NalLengthSize TEXT NULL, IsAvc BIT NULL, Title TEXT NULL, TimeBase TEXT NULL, CodecTimeBase TEXT NULL, PRIMARY KEY (ItemId, StreamIndex))";
 
             string[] queries = {
 
                                 "create table if not exists TypedBaseItems (guid GUID primary key, type TEXT, data BLOB, ParentId GUID, Path TEXT)",
-                                "create index if not exists idx_TypedBaseItems on TypedBaseItems(guid)",
                                 "create index if not exists idx_PathTypedBaseItems on TypedBaseItems(Path)",
                                 "create index if not exists idx_ParentIdTypedBaseItems on TypedBaseItems(ParentId)",
 
@@ -136,26 +157,29 @@ namespace MediaBrowser.Server.Implementations.Persistence
                                 "create index if not exists idx_AncestorIds1 on AncestorIds(AncestorId)",
                                 "create index if not exists idx_AncestorIds2 on AncestorIds(AncestorIdText)",
 
-                                "create table if not exists UserDataKeys (ItemId GUID, UserDataKey TEXT, PRIMARY KEY (ItemId, UserDataKey))",
-                                "create index if not exists idx_UserDataKeys1 on UserDataKeys(ItemId)",
+                                "create table if not exists UserDataKeys (ItemId GUID, UserDataKey TEXT Priority INT, PRIMARY KEY (ItemId, UserDataKey))",
 
-                                "create table if not exists ItemValues (ItemId GUID, Type INT, Value TEXT)",
-                                "create index if not exists idx_ItemValues on ItemValues(ItemId)",
+                                "create table if not exists ItemValues (ItemId GUID, Type INT, Value TEXT, CleanValue TEXT)",
+
+                                "create table if not exists ProviderIds (ItemId GUID, Name TEXT, Value TEXT, PRIMARY KEY (ItemId, Name))",
+                                // covering index
+                                "create index if not exists Idx_ProviderIds1 on ProviderIds(ItemId,Name,Value)",
+
+                                "create table if not exists Images (ItemId GUID NOT NULL, Path TEXT NOT NULL, ImageType INT NOT NULL, DateModified DATETIME, IsPlaceHolder BIT NOT NULL, SortOrder INT)",
+                                "create index if not exists idx_Images on Images(ItemId)",
 
                                 "create table if not exists People (ItemId GUID, Name TEXT NOT NULL, Role TEXT, PersonType TEXT, SortOrder int, ListOrder int)",
-                                "create index if not exists idxPeopleItemId on People(ItemId)",
+
+                                "drop index if exists idxPeopleItemId",
+                                "create index if not exists idxPeopleItemId1 on People(ItemId,ListOrder)",
                                 "create index if not exists idxPeopleName on People(Name)",
 
                                 "create table if not exists "+ChaptersTableName+" (ItemId GUID, ChapterIndex INT, StartPositionTicks BIGINT, Name TEXT, ImagePath TEXT, PRIMARY KEY (ItemId, ChapterIndex))",
-                                "create index if not exists idx_"+ChaptersTableName+"1 on "+ChaptersTableName+"(ItemId)",
 
                                 createMediaStreamsTableCommand,
-                                "create index if not exists idx_mediastreams1 on mediastreams(ItemId)",
 
-                                //pragmas
-                                "pragma temp_store = memory",
+                                "create index if not exists idx_mediastreams1 on mediastreams(ItemId)",
 
-                                "pragma shrink_memory"
                                };
 
             _connection.RunQueries(queries, Logger);
@@ -239,67 +263,77 @@ namespace MediaBrowser.Server.Implementations.Persistence
             _connection.AddColumn(Logger, "TypedBaseItems", "DateLastMediaAdded", "DATETIME");
             _connection.AddColumn(Logger, "TypedBaseItems", "Album", "Text");
             _connection.AddColumn(Logger, "TypedBaseItems", "IsVirtualItem", "BIT");
+            _connection.AddColumn(Logger, "TypedBaseItems", "SeriesName", "Text");
+            _connection.AddColumn(Logger, "TypedBaseItems", "UserDataKey", "Text");
 
             _connection.AddColumn(Logger, "UserDataKeys", "Priority", "INT");
+            _connection.AddColumn(Logger, "ItemValues", "CleanValue", "Text");
 
             string[] postQueries =
-                {
+
+                                {
+                // obsolete
+                "drop index if exists idx_TypedBaseItems",
+                "drop index if exists idx_mediastreams",
+                "drop index if exists idx_"+ChaptersTableName,
+                "drop index if exists idx_UserDataKeys1",
+                "drop index if exists idx_UserDataKeys2",
+                "drop index if exists idx_TypeTopParentId3",
+                "drop index if exists idx_TypeTopParentId2",
+                "drop index if exists idx_TypeTopParentId4",
+                "drop index if exists idx_Type",
+                "drop index if exists idx_TypeTopParentId",
+                "drop index if exists idx_GuidType",
+                "drop index if exists idx_TopParentId",
+                "drop index if exists idx_TypeTopParentId6",
+                "drop index if exists idx_ItemValues2",
+                "drop index if exists Idx_ProviderIds",
+                "drop index if exists idx_ItemValues3",
+                "drop index if exists idx_ItemValues4",
+                "drop index if exists idx_ItemValues5",
+
                 "create index if not exists idx_PresentationUniqueKey on TypedBaseItems(PresentationUniqueKey)",
-                "create index if not exists idx_Type on TypedBaseItems(Type)",
-                "create index if not exists idx_TopParentId on TypedBaseItems(TopParentId)"
-            };
+                "create index if not exists idx_GuidTypeIsFolderIsVirtualItem on TypedBaseItems(Guid,Type,IsFolder,IsVirtualItem)",
+                //"create index if not exists idx_GuidMediaTypeIsFolderIsVirtualItem on TypedBaseItems(Guid,MediaType,IsFolder,IsVirtualItem)",
+                "create index if not exists idx_CleanNameType on TypedBaseItems(CleanName,Type)",
 
-            _connection.RunQueries(postQueries, Logger);
+                // covering index
+                "create index if not exists idx_TopParentIdGuid on TypedBaseItems(TopParentId,Guid)",
 
-            PrepareStatements();
+                // live tv programs
+                "create index if not exists idx_TypeTopParentIdStartDate on TypedBaseItems(Type,TopParentId,StartDate)",
 
-            new MediaStreamColumns(_connection, Logger).AddColumns();
+                // covering index for getitemvalues
+                "create index if not exists idx_TypeTopParentIdGuid on TypedBaseItems(Type,TopParentId,Guid)",
 
-            var mediaStreamsDbFile = Path.Combine(_config.ApplicationPaths.DataPath, "mediainfo.db");
-            if (File.Exists(mediaStreamsDbFile))
-            {
-                MigrateMediaStreams(mediaStreamsDbFile);
-            }
+                // used by movie suggestions
+                "create index if not exists idx_TypeTopParentIdGroup on TypedBaseItems(Type,TopParentId,PresentationUniqueKey)",
+                "create index if not exists idx_TypeTopParentId5 on TypedBaseItems(TopParentId,IsVirtualItem)",
 
-            DataExtensions.Attach(_connection, Path.Combine(_config.ApplicationPaths.DataPath, "userdata_v2.db"), "UserDataDb");
-        }
+                // latest items
+                "create index if not exists idx_TypeTopParentId9 on TypedBaseItems(TopParentId,Type,IsVirtualItem,PresentationUniqueKey,DateCreated)",
+                "create index if not exists idx_TypeTopParentId8 on TypedBaseItems(TopParentId,IsFolder,IsVirtualItem,PresentationUniqueKey,DateCreated)",
 
-        private void MigrateMediaStreams(string file)
-        {
-            try
-            {
-                var backupFile = file + ".bak";
-                File.Copy(file, backupFile, true);
-                DataExtensions.Attach(_connection, backupFile, "MediaInfoOld");
+                // resume
+                "create index if not exists idx_TypeTopParentId7 on TypedBaseItems(TopParentId,MediaType,IsVirtualItem,PresentationUniqueKey)",
 
-                var columns = string.Join(",", _mediaStreamSaveColumns);
+                // items by name
+                "create index if not exists idx_ItemValues6 on ItemValues(ItemId,Type,CleanValue)",
+                "create index if not exists idx_ItemValues7 on ItemValues(Type,CleanValue,ItemId)",
 
-                string[] queries = {
-                                "REPLACE INTO mediastreams("+columns+") SELECT "+columns+" FROM MediaInfoOld.mediastreams;"
-                               };
+                // covering index
+                "create index if not exists idx_UserDataKeys3 on UserDataKeys(ItemId,Priority,UserDataKey)"
+                };
 
-                _connection.RunQueries(queries, Logger);
-            }
-            catch (Exception ex)
-            {
-                Logger.ErrorException("Error migrating media info database", ex);
-            }
-            finally
-            {
-                TryDeleteFile(file);
-            }
-        }
+            _connection.RunQueries(postQueries, Logger);
 
-        private void TryDeleteFile(string file)
-        {
-            try
-            {
-                File.Delete(file);
-            }
-            catch (Exception ex)
-            {
-                Logger.ErrorException("Error deleting file {0}", ex, file);
-            }
+            PrepareStatements();
+
+            new MediaStreamColumns(_connection, Logger).AddColumns();
+
+            DataExtensions.Attach(_connection, Path.Combine(_config.ApplicationPaths.DataPath, "userdata_v2.db"), "UserDataDb");
+            await userDataRepo.Initialize(_connection, WriteLock).ConfigureAwait(false);
+            //await Vacuum(_connection).ConfigureAwait(false);
         }
 
         private readonly string[] _retriveItemColumns =
@@ -396,7 +430,9 @@ namespace MediaBrowser.Server.Implementations.Persistence
             "Comment",
             "NalLengthSize",
             "IsAvc",
-            "Title"
+            "Title",
+            "TimeBase",
+            "CodecTimeBase"
         };
 
         /// <summary>
@@ -478,7 +514,9 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 "PrimaryVersionId",
                 "DateLastMediaAdded",
                 "Album",
-                "IsVirtualItem"
+                "IsVirtualItem",
+                "SeriesName",
+                "UserDataKey"
             };
             _saveItemCommand = _connection.CreateCommand();
             _saveItemCommand.CommandText = "replace into TypedBaseItems (" + string.Join(",", saveColumns.ToArray()) + ") values (";
@@ -581,11 +619,36 @@ namespace MediaBrowser.Server.Implementations.Persistence
             _deleteItemValuesCommand.Parameters.Add(_deleteItemValuesCommand, "@Id");
 
             _saveItemValuesCommand = _connection.CreateCommand();
-            _saveItemValuesCommand.CommandText = "insert into ItemValues (ItemId, Type, Value) values (@ItemId, @Type, @Value)";
+            _saveItemValuesCommand.CommandText = "insert into ItemValues (ItemId, Type, Value, CleanValue) values (@ItemId, @Type, @Value, @CleanValue)";
             _saveItemValuesCommand.Parameters.Add(_saveItemValuesCommand, "@ItemId");
             _saveItemValuesCommand.Parameters.Add(_saveItemValuesCommand, "@Type");
             _saveItemValuesCommand.Parameters.Add(_saveItemValuesCommand, "@Value");
-
+            _saveItemValuesCommand.Parameters.Add(_saveItemValuesCommand, "@CleanValue");
+
+            // provider ids
+            _deleteProviderIdsCommand = _connection.CreateCommand();
+            _deleteProviderIdsCommand.CommandText = "delete from ProviderIds where ItemId=@Id";
+            _deleteProviderIdsCommand.Parameters.Add(_deleteProviderIdsCommand, "@Id");
+
+            _saveProviderIdsCommand = _connection.CreateCommand();
+            _saveProviderIdsCommand.CommandText = "insert into ProviderIds (ItemId, Name, Value) values (@ItemId, @Name, @Value)";
+            _saveProviderIdsCommand.Parameters.Add(_saveProviderIdsCommand, "@ItemId");
+            _saveProviderIdsCommand.Parameters.Add(_saveProviderIdsCommand, "@Name");
+            _saveProviderIdsCommand.Parameters.Add(_saveProviderIdsCommand, "@Value");
+
+            // images
+            _deleteImagesCommand = _connection.CreateCommand();
+            _deleteImagesCommand.CommandText = "delete from Images where ItemId=@Id";
+            _deleteImagesCommand.Parameters.Add(_deleteImagesCommand, "@Id");
+
+            _saveImagesCommand = _connection.CreateCommand();
+            _saveImagesCommand.CommandText = "insert into Images (ItemId, ImageType, Path, DateModified, IsPlaceHolder, SortOrder) values (@ItemId, @ImageType, @Path, @DateModified, @IsPlaceHolder, @SortOrder)";
+            _saveImagesCommand.Parameters.Add(_saveImagesCommand, "@ItemId");
+            _saveImagesCommand.Parameters.Add(_saveImagesCommand, "@ImageType");
+            _saveImagesCommand.Parameters.Add(_saveImagesCommand, "@Path");
+            _saveImagesCommand.Parameters.Add(_saveImagesCommand, "@DateModified");
+            _saveImagesCommand.Parameters.Add(_saveImagesCommand, "@IsPlaceHolder");
+            _saveImagesCommand.Parameters.Add(_saveImagesCommand, "@SortOrder");
         }
 
         /// <summary>
@@ -870,16 +933,20 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
                     _saveItemCommand.GetParameter(index++).Value = item.Album;
 
-                    var season = item as Season;
-                    if (season != null && season.IsVirtualItem.HasValue)
+                    _saveItemCommand.GetParameter(index++).Value = item.IsVirtualItem || (!item.IsFolder && item.LocationType == LocationType.Virtual);
+
+                    var hasSeries = item as IHasSeries;
+                    if (hasSeries != null)
                     {
-                        _saveItemCommand.GetParameter(index++).Value = season.IsVirtualItem.Value;
+                        _saveItemCommand.GetParameter(index++).Value = hasSeries.SeriesName;
                     }
                     else
                     {
                         _saveItemCommand.GetParameter(index++).Value = null;
                     }
 
+                    _saveItemCommand.GetParameter(index++).Value = item.GetUserDataKeys().FirstOrDefault();
+
                     _saveItemCommand.Transaction = transaction;
 
                     _saveItemCommand.ExecuteNonQuery();
@@ -890,7 +957,9 @@ namespace MediaBrowser.Server.Implementations.Persistence
                     }
 
                     UpdateUserDataKeys(item.Id, item.GetUserDataKeys().Distinct(StringComparer.OrdinalIgnoreCase).ToList(), transaction);
-                    UpdateItemValues(item.Id, GetItemValues(item), transaction);
+                    UpdateImages(item.Id, item.ImageInfos, transaction);
+                    UpdateProviderIds(item.Id, item.ProviderIds, transaction);
+                    UpdateItemValues(item.Id, GetItemValuesToSave(item), transaction);
                 }
 
                 transaction.Commit();
@@ -966,7 +1035,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             if (type == null)
             {
-                Logger.Debug("Unknown type {0}", typeString);
+                //Logger.Debug("Unknown type {0}", typeString);
 
                 return null;
             }
@@ -1295,10 +1364,9 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 item.CriticRatingSummary = reader.GetString(57);
             }
 
-            var season = item as Season;
-            if (season != null && !reader.IsDBNull(58))
+            if (!reader.IsDBNull(58))
             {
-                season.IsVirtualItem = reader.GetBoolean(58);
+                item.IsVirtualItem = reader.GetBoolean(58);
             }
 
             return item;
@@ -1450,7 +1518,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
         /// or
         /// cancellationToken
         /// </exception>
-        public async Task SaveChapters(Guid id, IEnumerable<ChapterInfo> chapters, CancellationToken cancellationToken)
+        public async Task SaveChapters(Guid id, List<ChapterInfo> chapters, CancellationToken cancellationToken)
         {
             CheckDisposed();
 
@@ -1549,14 +1617,14 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
         private bool EnableJoinUserData(InternalItemsQuery query)
         {
-            if (_config.Configuration.SchemaVersion < 76)
+            if (query.User == null)
             {
                 return false;
             }
 
-            if (query.User == null)
+            if (query.SimilarTo != null && query.User != null)
             {
-                return false;
+                return true;
             }
 
             if (query.SortBy != null && query.SortBy.Length > 0)
@@ -1611,7 +1679,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
             return false;
         }
 
-        private string[] GetFinalColumnsToSelect(InternalItemsQuery query, string[] startColumns)
+        private string[] GetFinalColumnsToSelect(InternalItemsQuery query, string[] startColumns, IDbCommand cmd)
         {
             var list = startColumns.ToList();
 
@@ -1626,6 +1694,47 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 list.Add("UserDataDb.UserData.rating");
             }
 
+            if (query.SimilarTo != null)
+            {
+                var item = query.SimilarTo;
+
+                var builder = new StringBuilder();
+                builder.Append("(");
+
+                builder.Append("((OfficialRating=@ItemOfficialRating) * 10)");
+                //builder.Append("+ ((ProductionYear=@ItemProductionYear) * 10)");
+
+                builder.Append("+(Select Case When Abs(COALESCE(ProductionYear, 0) - @ItemProductionYear) < 10 Then 2 Else 0 End )");
+                builder.Append("+(Select Case When Abs(COALESCE(ProductionYear, 0) - @ItemProductionYear) < 5 Then 2 Else 0 End )");
+
+                //// genres
+                builder.Append("+ ((Select count(CleanValue) from ItemValues where ItemId=Guid and Type=2 and CleanValue in (select CleanValue from itemvalues where ItemId=@SimilarItemId and type=2)) * 10)");
+
+                //// tags
+                builder.Append("+ ((Select count(CleanValue) from ItemValues where ItemId=Guid and Type=4 and CleanValue in (select CleanValue from itemvalues where ItemId=@SimilarItemId and type=4)) * 10)");
+
+                builder.Append("+ ((Select count(CleanValue) from ItemValues where ItemId=Guid and Type=5 and CleanValue in (select CleanValue from itemvalues where ItemId=@SimilarItemId and type=5)) * 10)");
+
+                builder.Append("+ ((Select count(CleanValue) from ItemValues where ItemId=Guid and Type=3 and CleanValue in (select CleanValue from itemvalues where ItemId=@SimilarItemId and type=3)) * 3)");
+
+                //builder.Append("+ ((Select count(Name) from People where ItemId=Guid and Name in (select Name from People where ItemId=@SimilarItemId)) * 3)");
+
+                ////builder.Append("(select group_concat((Select Name from People where ItemId=Guid and Name in (Select Name from People where ItemId=@SimilarItemId)), '|'))");
+
+                builder.Append(") as SimilarityScore");
+
+                list.Add(builder.ToString());
+                cmd.Parameters.Add(cmd, "@ItemOfficialRating", DbType.String).Value = item.OfficialRating;
+                cmd.Parameters.Add(cmd, "@ItemProductionYear", DbType.Int32).Value = item.ProductionYear ?? 0;
+                cmd.Parameters.Add(cmd, "@SimilarItemId", DbType.Guid).Value = item.Id;
+
+                var excludeIds = query.ExcludeItemIds.ToList();
+                excludeIds.Add(item.Id.ToString("N"));
+                query.ExcludeItemIds = excludeIds.ToArray();
+
+                query.ExcludeProviderIds = item.ProviderIds;
+            }
+
             return list.ToArray();
         }
 
@@ -1636,10 +1745,37 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 return string.Empty;
             }
 
-            return " left join UserDataDb.UserData on (select UserDataKey from UserDataKeys where ItemId=Guid order by Priority LIMIT 1)=UserDataDb.UserData.Key";
+            if (_config.Configuration.SchemaVersion >= 96)
+            {
+                return " left join UserDataDb.UserData on UserDataKey=UserDataDb.UserData.Key And (UserId=@UserId)";
+            }
+
+            return " left join UserDataDb.UserData on (select UserDataKey from UserDataKeys where ItemId=Guid order by Priority LIMIT 1)=UserDataDb.UserData.Key And (UserId=@UserId)";
         }
 
-        public IEnumerable<BaseItem> GetItemList(InternalItemsQuery query)
+        private string GetGroupBy(InternalItemsQuery query)
+        {
+            var groups = new List<string>();
+
+            if (EnableGroupByPresentationUniqueKey(query))
+            {
+                groups.Add("PresentationUniqueKey");
+            }
+
+            if (groups.Count > 0)
+            {
+                return " Group by " + string.Join(",", groups.ToArray());
+            }
+
+            return string.Empty;
+        }
+
+        private string GetFromText(string alias = "A")
+        {
+            return " from TypedBaseItems " + alias;
+        }
+
+        public List<BaseItem> GetItemList(InternalItemsQuery query)
         {
             if (query == null)
             {
@@ -1650,9 +1786,17 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             var now = DateTime.UtcNow;
 
+            var list = new List<BaseItem>();
+
+            // Hack for right now since we currently don't support filtering out these duplicates within a query
+            if (query.Limit.HasValue && query.EnableGroupByMetadataKey)
+            {
+                query.Limit = query.Limit.Value + 4;
+            }
+
             using (var cmd = _connection.CreateCommand())
             {
-                cmd.CommandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, _retriveItemColumns)) + " from TypedBaseItems";
+                cmd.CommandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, _retriveItemColumns, cmd)) + GetFromText();
                 cmd.CommandText += GetJoinUserDataText(query);
 
                 if (EnableJoinUserData(query))
@@ -1668,22 +1812,22 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
                 cmd.CommandText += whereText;
 
-                if (EnableGroupByPresentationUniqueKey(query) && _config.Configuration.SchemaVersion >= 66)
-                {
-                    cmd.CommandText += " Group by PresentationUniqueKey";
-                }
+                cmd.CommandText += GetGroupBy(query);
 
                 cmd.CommandText += GetOrderByText(query);
 
                 if (query.Limit.HasValue || query.StartIndex.HasValue)
                 {
-                    var limit = query.Limit ?? int.MaxValue;
+                    var offset = query.StartIndex ?? 0;
 
-                    cmd.CommandText += " LIMIT " + limit.ToString(CultureInfo.InvariantCulture);
+                    if (query.Limit.HasValue || offset > 0)
+                    {
+                        cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture);
+                    }
 
-                    if (query.StartIndex.HasValue)
+                    if (offset > 0)
                     {
-                        cmd.CommandText += " OFFSET " + query.StartIndex.Value.ToString(CultureInfo.InvariantCulture);
+                        cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture);
                     }
                 }
 
@@ -1696,11 +1840,61 @@ namespace MediaBrowser.Server.Implementations.Persistence
                         var item = GetItem(reader);
                         if (item != null)
                         {
-                            yield return item;
+                            list.Add(item);
                         }
                     }
                 }
             }
+
+            // Hack for right now since we currently don't support filtering out these duplicates within a query
+            if (query.EnableGroupByMetadataKey)
+            {
+                var limit = query.Limit ?? int.MaxValue;
+                limit -= 4;
+                var newList = new List<BaseItem>();
+
+                foreach (var item in list)
+                {
+                    AddItem(newList, item);
+
+                    if (newList.Count >= limit)
+                    {
+                        break;
+                    }
+                }
+
+                list = newList;
+            }
+
+            return list;
+        }
+
+        private void AddItem(List<BaseItem> items, BaseItem newItem)
+        {
+            var providerIds = newItem.ProviderIds.ToList();
+
+            for (var i = 0; i < items.Count; i++)
+            {
+                var item = items[i];
+
+                foreach (var providerId in providerIds)
+                {
+                    if (providerId.Key == MetadataProviders.TmdbCollection.ToString())
+                    {
+                        continue;
+                    }
+                    if (item.GetProviderId(providerId.Key) == providerId.Value)
+                    {
+                        if (newItem.SourceType == SourceType.Library)
+                        {
+                            items[i] = newItem;
+                        }
+                        return;
+                    }
+                }
+            }
+
+            items.Add(newItem);
         }
 
         private void LogQueryTime(string methodName, IDbCommand cmd, DateTime startDate)
@@ -1710,7 +1904,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
             var slowThreshold = 1000;
 
 #if DEBUG
-            slowThreshold = 200;
+            slowThreshold = 50;
 #endif
 
             if (elapsed >= slowThreshold)
@@ -1738,11 +1932,21 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             CheckDisposed();
 
+            if (!query.EnableTotalRecordCount || (!query.Limit.HasValue && (query.StartIndex ?? 0) == 0))
+            {
+                var list = GetItemList(query);
+                return new QueryResult<BaseItem>
+                {
+                    Items = list.ToArray(),
+                    TotalRecordCount = list.Count
+                };
+            }
+
             var now = DateTime.UtcNow;
 
             using (var cmd = _connection.CreateCommand())
             {
-                cmd.CommandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, _retriveItemColumns)) + " from TypedBaseItems";
+                cmd.CommandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, _retriveItemColumns, cmd)) + GetFromText();
                 cmd.CommandText += GetJoinUserDataText(query);
 
                 if (EnableJoinUserData(query))
@@ -1762,32 +1966,41 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
                 cmd.CommandText += whereText;
 
-                if (EnableGroupByPresentationUniqueKey(query) && _config.Configuration.SchemaVersion >= 66)
-                {
-                    cmd.CommandText += " Group by PresentationUniqueKey";
-                }
+                cmd.CommandText += GetGroupBy(query);
 
                 cmd.CommandText += GetOrderByText(query);
 
                 if (query.Limit.HasValue || query.StartIndex.HasValue)
                 {
-                    var limit = query.Limit ?? int.MaxValue;
+                    var offset = query.StartIndex ?? 0;
 
-                    cmd.CommandText += " LIMIT " + limit.ToString(CultureInfo.InvariantCulture);
+                    if (query.Limit.HasValue || offset > 0)
+                    {
+                        cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture);
+                    }
 
-                    if (query.StartIndex.HasValue)
+                    if (offset > 0)
                     {
-                        cmd.CommandText += " OFFSET " + query.StartIndex.Value.ToString(CultureInfo.InvariantCulture);
+                        cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture);
                     }
                 }
 
-                if (EnableGroupByPresentationUniqueKey(query) && _config.Configuration.SchemaVersion >= 66)
+                cmd.CommandText += ";";
+
+                var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0;
+
+                if (isReturningZeroItems)
                 {
-                    cmd.CommandText += "; select count (distinct PresentationUniqueKey) from TypedBaseItems";
+                    cmd.CommandText = "";
+                }
+
+                if (EnableGroupByPresentationUniqueKey(query))
+                {
+                    cmd.CommandText += " select count (distinct PresentationUniqueKey)" + GetFromText();
                 }
                 else
                 {
-                    cmd.CommandText += "; select count (guid) from TypedBaseItems";
+                    cmd.CommandText += " select count (guid)" + GetFromText();
                 }
 
                 cmd.CommandText += GetJoinUserDataText(query);
@@ -1800,18 +2013,28 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 {
                     LogQueryTime("GetItems", cmd, now);
 
-                    while (reader.Read())
+                    if (isReturningZeroItems)
                     {
-                        var item = GetItem(reader);
-                        if (item != null)
+                        if (reader.Read())
                         {
-                            list.Add(item);
+                            count = reader.GetInt32(0);
                         }
                     }
-
-                    if (reader.NextResult() && reader.Read())
+                    else
                     {
-                        count = reader.GetInt32(0);
+                        while (reader.Read())
+                        {
+                            var item = GetItem(reader);
+                            if (item != null)
+                            {
+                                list.Add(item);
+                            }
+                        }
+
+                        if (reader.NextResult() && reader.Read())
+                        {
+                            count = reader.GetInt32(0);
+                        }
                     }
                 }
 
@@ -1825,6 +2048,22 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
         private string GetOrderByText(InternalItemsQuery query)
         {
+            if (query.SimilarTo != null)
+            {
+                if (query.SortBy == null || query.SortBy.Length == 0)
+                {
+                    if (query.User != null)
+                    {
+                        query.SortBy = new[] { "SimilarityScore", ItemSortBy.IsPlayed, ItemSortBy.Random };
+                    }
+                    else
+                    {
+                        query.SortBy = new[] { "SimilarityScore", ItemSortBy.Random };
+                    }
+                    query.SortOrder = SortOrder.Descending;
+                }
+            }
+
             if (query.SortBy == null || query.SortBy.Length == 0)
             {
                 return string.Empty;
@@ -1834,7 +2073,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             return " ORDER BY " + string.Join(",", query.SortBy.Select(i =>
             {
-                var columnMap = MapOrderByField(i, EnableJoinUserData(query));
+                var columnMap = MapOrderByField(i, query);
                 var columnAscending = isAscending;
                 if (columnMap.Item2)
                 {
@@ -1847,7 +2086,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
             }).ToArray());
         }
 
-        private Tuple<string, bool> MapOrderByField(string name, bool enableUserData)
+        private Tuple<string, bool> MapOrderByField(string name, InternalItemsQuery query)
         {
             if (string.Equals(name, ItemSortBy.AirTime, StringComparison.OrdinalIgnoreCase))
             {
@@ -1862,69 +2101,53 @@ namespace MediaBrowser.Server.Implementations.Persistence
             {
                 return new Tuple<string, bool>("RANDOM()", false);
             }
+            if (string.Equals(name, ItemSortBy.DatePlayed, StringComparison.OrdinalIgnoreCase))
+            {
+                return new Tuple<string, bool>("LastPlayedDate", false);
+            }
+            if (string.Equals(name, ItemSortBy.PlayCount, StringComparison.OrdinalIgnoreCase))
+            {
+                return new Tuple<string, bool>("PlayCount", false);
+            }
+            if (string.Equals(name, ItemSortBy.IsFavoriteOrLiked, StringComparison.OrdinalIgnoreCase))
+            {
+                return new Tuple<string, bool>("IsFavorite", true);
+            }
             if (string.Equals(name, ItemSortBy.IsFolder, StringComparison.OrdinalIgnoreCase))
             {
                 return new Tuple<string, bool>("IsFolder", true);
             }
-
-            if (enableUserData)
+            if (string.Equals(name, ItemSortBy.IsPlayed, StringComparison.OrdinalIgnoreCase))
             {
-                if (string.Equals(name, ItemSortBy.DatePlayed, StringComparison.OrdinalIgnoreCase))
-                {
-                    return new Tuple<string, bool>("LastPlayedDate", false);
-                }
-                if (string.Equals(name, ItemSortBy.PlayCount, StringComparison.OrdinalIgnoreCase))
-                {
-                    return new Tuple<string, bool>("PlayCount", false);
-                }
-                if (string.Equals(name, ItemSortBy.IsFavoriteOrLiked, StringComparison.OrdinalIgnoreCase))
-                {
-                    return new Tuple<string, bool>("IsFavorite", true);
-                }
-                if (string.Equals(name, ItemSortBy.IsPlayed, StringComparison.OrdinalIgnoreCase))
-                {
-                    return new Tuple<string, bool>("played", true);
-                }
-                if (string.Equals(name, ItemSortBy.IsUnplayed, StringComparison.OrdinalIgnoreCase))
-                {
-                    return new Tuple<string, bool>("played", false);
-                }
+                return new Tuple<string, bool>("played", true);
             }
-            else
+            if (string.Equals(name, ItemSortBy.IsUnplayed, StringComparison.OrdinalIgnoreCase))
             {
-                if (string.Equals(name, ItemSortBy.DatePlayed, StringComparison.OrdinalIgnoreCase))
-                {
-                    return new Tuple<string, bool>("DateCreated", false);
-                }
-                if (string.Equals(name, ItemSortBy.PlayCount, StringComparison.OrdinalIgnoreCase))
-                {
-                    return new Tuple<string, bool>("DateCreated", false);
-                }
-                if (string.Equals(name, ItemSortBy.IsFavoriteOrLiked, StringComparison.OrdinalIgnoreCase))
-                {
-                    return new Tuple<string, bool>("DateCreated", true);
-                }
-                if (string.Equals(name, ItemSortBy.IsPlayed, StringComparison.OrdinalIgnoreCase))
-                {
-                    return new Tuple<string, bool>("DateCreated", true);
-                }
-                if (string.Equals(name, ItemSortBy.IsUnplayed, StringComparison.OrdinalIgnoreCase))
-                {
-                    return new Tuple<string, bool>("DateCreated", false);
-                }
+                return new Tuple<string, bool>("played", false);
             }
-
             if (string.Equals(name, ItemSortBy.DateLastContentAdded, StringComparison.OrdinalIgnoreCase))
             {
                 return new Tuple<string, bool>("DateLastMediaAdded", false);
             }
             if (string.Equals(name, ItemSortBy.Artist, StringComparison.OrdinalIgnoreCase))
             {
-                return new Tuple<string, bool>("(select value from itemvalues where ItemId=Guid and Type=0 LIMIT 1)", false);
+                return new Tuple<string, bool>("(select CleanValue from itemvalues where ItemId=Guid and Type=0 LIMIT 1)", false);
             }
             if (string.Equals(name, ItemSortBy.AlbumArtist, StringComparison.OrdinalIgnoreCase))
             {
-                return new Tuple<string, bool>("(select value from itemvalues where ItemId=Guid and Type=1 LIMIT 1)", false);
+                return new Tuple<string, bool>("(select CleanValue from itemvalues where ItemId=Guid and Type=1 LIMIT 1)", false);
+            }
+            if (string.Equals(name, ItemSortBy.OfficialRating, StringComparison.OrdinalIgnoreCase))
+            {
+                return new Tuple<string, bool>("ParentalRatingValue", false);
+            }
+            if (string.Equals(name, ItemSortBy.Studio, StringComparison.OrdinalIgnoreCase))
+            {
+                return new Tuple<string, bool>("(select CleanValue from itemvalues where ItemId=Guid and Type=3 LIMIT 1)", false);
+            }
+            if (string.Equals(name, ItemSortBy.SeriesDatePlayed, StringComparison.OrdinalIgnoreCase))
+            {
+                return new Tuple<string, bool>("(Select MAX(LastPlayedDate) from TypedBaseItems B" + GetJoinUserDataText(query) + " where B.Guid in (Select ItemId from AncestorIds where AncestorId in (select guid from typedbaseitems c where C.Type = 'MediaBrowser.Controller.Entities.TV.Series' And C.Guid in (Select AncestorId from AncestorIds where ItemId=A.Guid))))", false);
             }
 
             return new Tuple<string, bool>(name, false);
@@ -1943,7 +2166,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             using (var cmd = _connection.CreateCommand())
             {
-                cmd.CommandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, new[] { "guid" })) + " from TypedBaseItems";
+                cmd.CommandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, new[] { "guid" }, cmd)) + GetFromText();
                 cmd.CommandText += GetJoinUserDataText(query);
 
                 if (EnableJoinUserData(query))
@@ -1959,22 +2182,22 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
                 cmd.CommandText += whereText;
 
-                if (EnableGroupByPresentationUniqueKey(query) && _config.Configuration.SchemaVersion >= 66)
-                {
-                    cmd.CommandText += " Group by PresentationUniqueKey";
-                }
+                cmd.CommandText += GetGroupBy(query);
 
                 cmd.CommandText += GetOrderByText(query);
 
                 if (query.Limit.HasValue || query.StartIndex.HasValue)
                 {
-                    var limit = query.Limit ?? int.MaxValue;
+                    var offset = query.StartIndex ?? 0;
 
-                    cmd.CommandText += " LIMIT " + limit.ToString(CultureInfo.InvariantCulture);
+                    if (query.Limit.HasValue || offset > 0)
+                    {
+                        cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture);
+                    }
 
-                    if (query.StartIndex.HasValue)
+                    if (offset > 0)
                     {
-                        cmd.CommandText += " OFFSET " + query.StartIndex.Value.ToString(CultureInfo.InvariantCulture);
+                        cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture);
                     }
                 }
 
@@ -2019,22 +2242,22 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
                 cmd.CommandText += whereText;
 
-                if (EnableGroupByPresentationUniqueKey(query) && _config.Configuration.SchemaVersion >= 66)
-                {
-                    cmd.CommandText += " Group by PresentationUniqueKey";
-                }
+                cmd.CommandText += GetGroupBy(query);
 
                 cmd.CommandText += GetOrderByText(query);
 
                 if (query.Limit.HasValue || query.StartIndex.HasValue)
                 {
-                    var limit = query.Limit ?? int.MaxValue;
+                    var offset = query.StartIndex ?? 0;
 
-                    cmd.CommandText += " LIMIT " + limit.ToString(CultureInfo.InvariantCulture);
+                    if (query.Limit.HasValue || offset > 0)
+                    {
+                        cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture);
+                    }
 
-                    if (query.StartIndex.HasValue)
+                    if (offset > 0)
                     {
-                        cmd.CommandText += " OFFSET " + query.StartIndex.Value.ToString(CultureInfo.InvariantCulture);
+                        cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture);
                     }
                 }
 
@@ -2082,11 +2305,21 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             CheckDisposed();
 
+            if (!query.EnableTotalRecordCount || (!query.Limit.HasValue && (query.StartIndex ?? 0) == 0))
+            {
+                var list = GetItemIdsList(query);
+                return new QueryResult<Guid>
+                {
+                    Items = list.ToArray(),
+                    TotalRecordCount = list.Count
+                };
+            }
+
             var now = DateTime.UtcNow;
 
             using (var cmd = _connection.CreateCommand())
             {
-                cmd.CommandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, new[] { "guid" })) + " from TypedBaseItems";
+                cmd.CommandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, new[] { "guid" }, cmd)) + GetFromText();
 
                 var whereClauses = GetWhereClauses(query, cmd);
                 cmd.CommandText += GetJoinUserDataText(query);
@@ -2102,32 +2335,32 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
                 cmd.CommandText += whereText;
 
-                if (EnableGroupByPresentationUniqueKey(query) && _config.Configuration.SchemaVersion >= 66)
-                {
-                    cmd.CommandText += " Group by PresentationUniqueKey";
-                }
+                cmd.CommandText += GetGroupBy(query);
 
                 cmd.CommandText += GetOrderByText(query);
 
                 if (query.Limit.HasValue || query.StartIndex.HasValue)
                 {
-                    var limit = query.Limit ?? int.MaxValue;
+                    var offset = query.StartIndex ?? 0;
 
-                    cmd.CommandText += " LIMIT " + limit.ToString(CultureInfo.InvariantCulture);
+                    if (query.Limit.HasValue || offset > 0)
+                    {
+                        cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture);
+                    }
 
-                    if (query.StartIndex.HasValue)
+                    if (offset > 0)
                     {
-                        cmd.CommandText += " OFFSET " + query.StartIndex.Value.ToString(CultureInfo.InvariantCulture);
+                        cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture);
                     }
                 }
 
-                if (EnableGroupByPresentationUniqueKey(query) && _config.Configuration.SchemaVersion >= 66)
+                if (EnableGroupByPresentationUniqueKey(query))
                 {
-                    cmd.CommandText += "; select count (distinct PresentationUniqueKey) from TypedBaseItems";
+                    cmd.CommandText += "; select count (distinct PresentationUniqueKey)" + GetFromText();
                 }
                 else
                 {
-                    cmd.CommandText += "; select count (guid) from TypedBaseItems";
+                    cmd.CommandText += "; select count (guid)" + GetFromText();
                 }
 
                 cmd.CommandText += GetJoinUserDataText(query);
@@ -2159,13 +2392,13 @@ namespace MediaBrowser.Server.Implementations.Persistence
             }
         }
 
-        private List<string> GetWhereClauses(InternalItemsQuery query, IDbCommand cmd)
+        private List<string> GetWhereClauses(InternalItemsQuery query, IDbCommand cmd, string paramSuffix = "")
         {
             var whereClauses = new List<string>();
 
             if (EnableJoinUserData(query))
             {
-                whereClauses.Add("(UserId is null or UserId=@UserId)");
+                //whereClauses.Add("(UserId is null or UserId=@UserId)");
             }
             if (query.IsCurrentSchema.HasValue)
             {
@@ -2196,7 +2429,24 @@ namespace MediaBrowser.Server.Implementations.Persistence
             }
             if (query.IsMovie.HasValue)
             {
-                whereClauses.Add("IsMovie=@IsMovie");
+                var alternateTypes = new List<string>();
+                if (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains(typeof(Movie).Name))
+                {
+                    alternateTypes.Add(typeof(Movie).FullName);
+                }
+                if (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains(typeof(Trailer).Name))
+                {
+                    alternateTypes.Add(typeof(Trailer).FullName);
+                }
+
+                if (alternateTypes.Count == 0)
+                {
+                    whereClauses.Add("IsMovie=@IsMovie");
+                }
+                else
+                {
+                    whereClauses.Add("(IsMovie is null OR IsMovie=@IsMovie)");
+                }
                 cmd.Parameters.Add(cmd, "@IsMovie", DbType.Boolean).Value = query.IsMovie;
             }
             if (query.IsKids.HasValue)
@@ -2218,8 +2468,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
             var includeTypes = query.IncludeItemTypes.SelectMany(MapIncludeItemTypes).ToArray();
             if (includeTypes.Length == 1)
             {
-                whereClauses.Add("type=@type");
-                cmd.Parameters.Add(cmd, "@type", DbType.String).Value = includeTypes[0];
+                whereClauses.Add("type=@type" + paramSuffix);
+                cmd.Parameters.Add(cmd, "@type" + paramSuffix, DbType.String).Value = includeTypes[0];
             }
             else if (includeTypes.Length > 1)
             {
@@ -2302,6 +2552,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 whereClauses.Add("ParentIndexNumber=@ParentIndexNumber");
                 cmd.Parameters.Add(cmd, "@ParentIndexNumber", DbType.Int32).Value = query.ParentIndexNumber.Value;
             }
+            if (query.ParentIndexNumberNotEquals.HasValue)
+            {
+                whereClauses.Add("(ParentIndexNumber<>@ParentIndexNumberNotEquals or ParentIndexNumber is null)");
+                cmd.Parameters.Add(cmd, "@ParentIndexNumberNotEquals", DbType.Int32).Value = query.ParentIndexNumberNotEquals.Value;
+            }
             if (query.MinEndDate.HasValue)
             {
                 whereClauses.Add("EndDate>=@MinEndDate");
@@ -2390,6 +2645,12 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 }
             }
 
+            if (query.PersonIds.Length > 0)
+            {
+                // Todo: improve without having to do this
+                query.Person = query.PersonIds.Select(i => RetrieveItem(new Guid(i))).Where(i => i != null).Select(i => i.Name).FirstOrDefault();
+            }
+
             if (!string.IsNullOrWhiteSpace(query.Person))
             {
                 whereClauses.Add("Guid in (select ItemId from People where Name=@PersonName)");
@@ -2398,41 +2659,25 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             if (!string.IsNullOrWhiteSpace(query.SlugName))
             {
-                if (_config.Configuration.SchemaVersion >= 70)
-                {
-                    whereClauses.Add("SlugName=@SlugName");
-                }
-                else
-                {
-                    whereClauses.Add("Name=@SlugName");
-                }
+                whereClauses.Add("SlugName=@SlugName");
                 cmd.Parameters.Add(cmd, "@SlugName", DbType.String).Value = query.SlugName;
             }
 
+            if (!string.IsNullOrWhiteSpace(query.MinSortName))
+            {
+                whereClauses.Add("SortName>=@MinSortName");
+                cmd.Parameters.Add(cmd, "@MinSortName", DbType.String).Value = query.MinSortName;
+            }
+
             if (!string.IsNullOrWhiteSpace(query.Name))
             {
-                if (_config.Configuration.SchemaVersion >= 66)
-                {
-                    whereClauses.Add("CleanName=@Name");
-                    cmd.Parameters.Add(cmd, "@Name", DbType.String).Value = query.Name.RemoveDiacritics();
-                }
-                else
-                {
-                    whereClauses.Add("Name=@Name");
-                    cmd.Parameters.Add(cmd, "@Name", DbType.String).Value = query.Name;
-                }
+                whereClauses.Add("CleanName=@Name");
+                cmd.Parameters.Add(cmd, "@Name", DbType.String).Value = query.Name.RemoveDiacritics();
             }
 
             if (!string.IsNullOrWhiteSpace(query.NameContains))
             {
-                if (_config.Configuration.SchemaVersion >= 66)
-                {
-                    whereClauses.Add("CleanName like @NameContains");
-                }
-                else
-                {
-                    whereClauses.Add("Name like @NameContains");
-                }
+                whereClauses.Add("CleanName like @NameContains");
                 cmd.Parameters.Add(cmd, "@NameContains", DbType.String).Value = "%" + query.NameContains.RemoveDiacritics() + "%";
             }
             if (!string.IsNullOrWhiteSpace(query.NameStartsWith))
@@ -2453,48 +2698,61 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 cmd.Parameters.Add(cmd, "@NameLessThan", DbType.String).Value = query.NameLessThan.ToLower();
             }
 
-            if (EnableJoinUserData(query))
+            if (query.ImageTypes.Length > 0 && _config.Configuration.SchemaVersion >= 87)
             {
-                if (query.IsLiked.HasValue)
+                var requiredImageIndex = 0;
+
+                foreach (var requiredImage in query.ImageTypes)
                 {
-                    if (query.IsLiked.Value)
-                    {
-                        whereClauses.Add("rating>=@UserRating");
-                        cmd.Parameters.Add(cmd, "@UserRating", DbType.Double).Value = UserItemData.MinLikeValue;
-                    }
-                    else
-                    {
-                        whereClauses.Add("(rating is null or rating<@UserRating)");
-                        cmd.Parameters.Add(cmd, "@UserRating", DbType.Double).Value = UserItemData.MinLikeValue;
-                    }
+                    var paramName = "@RequiredImageType" + requiredImageIndex;
+                    whereClauses.Add("(select path from images where ItemId=Guid and ImageType=" + paramName + " limit 1) not null");
+                    cmd.Parameters.Add(cmd, paramName, DbType.Int32).Value = (int)requiredImage;
+                    requiredImageIndex++;
                 }
+            }
 
-                if (query.IsFavoriteOrLiked.HasValue)
+            if (query.IsLiked.HasValue)
+            {
+                if (query.IsLiked.Value)
                 {
-                    if (query.IsFavoriteOrLiked.Value)
-                    {
-                        whereClauses.Add("IsFavorite=@IsFavoriteOrLiked");
-                    }
-                    else
-                    {
-                        whereClauses.Add("(IsFavorite is null or IsFavorite=@IsFavoriteOrLiked)");
-                    }
-                    cmd.Parameters.Add(cmd, "@IsFavoriteOrLiked", DbType.Boolean).Value = query.IsFavoriteOrLiked.Value;
+                    whereClauses.Add("rating>=@UserRating");
+                    cmd.Parameters.Add(cmd, "@UserRating", DbType.Double).Value = UserItemData.MinLikeValue;
                 }
+                else
+                {
+                    whereClauses.Add("(rating is null or rating<@UserRating)");
+                    cmd.Parameters.Add(cmd, "@UserRating", DbType.Double).Value = UserItemData.MinLikeValue;
+                }
+            }
 
-                if (query.IsFavorite.HasValue)
+            if (query.IsFavoriteOrLiked.HasValue)
+            {
+                if (query.IsFavoriteOrLiked.Value)
                 {
-                    if (query.IsFavorite.Value)
-                    {
-                        whereClauses.Add("IsFavorite=@IsFavorite");
-                    }
-                    else
-                    {
-                        whereClauses.Add("(IsFavorite is null or IsFavorite=@IsFavorite)");
-                    }
-                    cmd.Parameters.Add(cmd, "@IsFavorite", DbType.Boolean).Value = query.IsFavorite.Value;
+                    whereClauses.Add("IsFavorite=@IsFavoriteOrLiked");
+                }
+                else
+                {
+                    whereClauses.Add("(IsFavorite is null or IsFavorite=@IsFavoriteOrLiked)");
                 }
+                cmd.Parameters.Add(cmd, "@IsFavoriteOrLiked", DbType.Boolean).Value = query.IsFavoriteOrLiked.Value;
+            }
 
+            if (query.IsFavorite.HasValue)
+            {
+                if (query.IsFavorite.Value)
+                {
+                    whereClauses.Add("IsFavorite=@IsFavorite");
+                }
+                else
+                {
+                    whereClauses.Add("(IsFavorite is null or IsFavorite=@IsFavorite)");
+                }
+                cmd.Parameters.Add(cmd, "@IsFavorite", DbType.Boolean).Value = query.IsFavorite.Value;
+            }
+
+            if (EnableJoinUserData(query))
+            {
                 if (query.IsPlayed.HasValue)
                 {
                     if (query.IsPlayed.Value)
@@ -2507,17 +2765,17 @@ namespace MediaBrowser.Server.Implementations.Persistence
                     }
                     cmd.Parameters.Add(cmd, "@IsPlayed", DbType.Boolean).Value = query.IsPlayed.Value;
                 }
+            }
 
-                if (query.IsResumable.HasValue)
+            if (query.IsResumable.HasValue)
+            {
+                if (query.IsResumable.Value)
                 {
-                    if (query.IsResumable.Value)
-                    {
-                        whereClauses.Add("playbackPositionTicks > 0");
-                    }
-                    else
-                    {
-                        whereClauses.Add("(playbackPositionTicks is null or playbackPositionTicks = 0)");
-                    }
+                    whereClauses.Add("playbackPositionTicks > 0");
+                }
+                else
+                {
+                    whereClauses.Add("(playbackPositionTicks is null or playbackPositionTicks = 0)");
                 }
             }
 
@@ -2527,22 +2785,28 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 var index = 0;
                 foreach (var artist in query.ArtistNames)
                 {
-                    clauses.Add("@ArtistName" + index + " in (select value from itemvalues where ItemId=Guid and Type <= 1)");
-                    cmd.Parameters.Add(cmd, "@ArtistName" + index, DbType.String).Value = artist;
+                    clauses.Add("@ArtistName" + index + " in (select CleanValue from itemvalues where ItemId=Guid and Type <= 1)");
+                    cmd.Parameters.Add(cmd, "@ArtistName" + index, DbType.String).Value = artist.RemoveDiacritics();
                     index++;
                 }
                 var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")";
                 whereClauses.Add(clause);
             }
 
+            if (query.GenreIds.Length > 0)
+            {
+                // Todo: improve without having to do this
+                query.Genres = query.GenreIds.Select(i => RetrieveItem(new Guid(i))).Where(i => i != null).Select(i => i.Name).ToArray();
+            }
+
             if (query.Genres.Length > 0)
             {
                 var clauses = new List<string>();
                 var index = 0;
                 foreach (var item in query.Genres)
                 {
-                    clauses.Add("Genres like @Genres" + index);
-                    cmd.Parameters.Add(cmd, "@Genres" + index, DbType.String).Value = "%" + item + "%";
+                    clauses.Add("@Genre" + index + " in (select CleanValue from itemvalues where ItemId=Guid and Type=2)");
+                    cmd.Parameters.Add(cmd, "@Genre" + index, DbType.String).Value = item.RemoveDiacritics();
                     index++;
                 }
                 var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")";
@@ -2555,22 +2819,56 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 var index = 0;
                 foreach (var item in query.Tags)
                 {
-                    clauses.Add("Tags like @Tags" + index);
-                    cmd.Parameters.Add(cmd, "@Tags" + index, DbType.String).Value = "%" + item + "%";
+                    clauses.Add("@Tag" + index + " in (select CleanValue from itemvalues where ItemId=Guid and Type=4)");
+                    cmd.Parameters.Add(cmd, "@Tag" + index, DbType.String).Value = item.RemoveDiacritics();
                     index++;
                 }
                 var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")";
                 whereClauses.Add(clause);
             }
 
+            if (query.StudioIds.Length > 0)
+            {
+                // Todo: improve without having to do this
+                query.Studios = query.StudioIds.Select(i => RetrieveItem(new Guid(i))).Where(i => i != null).Select(i => i.Name).ToArray();
+            }
+
             if (query.Studios.Length > 0)
             {
                 var clauses = new List<string>();
                 var index = 0;
                 foreach (var item in query.Studios)
                 {
-                    clauses.Add("Studios like @Studios" + index);
-                    cmd.Parameters.Add(cmd, "@Studios" + index, DbType.String).Value = "%" + item + "%";
+                    clauses.Add("@Studio" + index + " in (select CleanValue from itemvalues where ItemId=Guid and Type=3)");
+                    cmd.Parameters.Add(cmd, "@Studio" + index, DbType.String).Value = item.RemoveDiacritics();
+                    index++;
+                }
+                var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")";
+                whereClauses.Add(clause);
+            }
+
+            if (query.Keywords.Length > 0)
+            {
+                var clauses = new List<string>();
+                var index = 0;
+                foreach (var item in query.Keywords)
+                {
+                    clauses.Add("@Keyword" + index + " in (select CleanValue from itemvalues where ItemId=Guid and Type=5)");
+                    cmd.Parameters.Add(cmd, "@Keyword" + index, DbType.String).Value = item.RemoveDiacritics();
+                    index++;
+                }
+                var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")";
+                whereClauses.Add(clause);
+            }
+
+            if (query.OfficialRatings.Length > 0)
+            {
+                var clauses = new List<string>();
+                var index = 0;
+                foreach (var item in query.OfficialRatings)
+                {
+                    clauses.Add("OfficialRating=@OfficialRating" + index);
+                    cmd.Parameters.Add(cmd, "@OfficialRating" + index, DbType.String).Value = item;
                     index++;
                 }
                 var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")";
@@ -2635,8 +2933,15 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             if (query.LocationTypes.Length == 1)
             {
-                whereClauses.Add("LocationType=@LocationType");
-                cmd.Parameters.Add(cmd, "@LocationType", DbType.String).Value = query.LocationTypes[0].ToString();
+                if (query.LocationTypes[0] == LocationType.Virtual && _config.Configuration.SchemaVersion >= 90)
+                {
+                    query.IsVirtualItem = true;
+                }
+                else
+                {
+                    whereClauses.Add("LocationType=@LocationType");
+                    cmd.Parameters.Add(cmd, "@LocationType", DbType.String).Value = query.LocationTypes[0].ToString();
+                }
             }
             else if (query.LocationTypes.Length > 1)
             {
@@ -2646,8 +2951,15 @@ namespace MediaBrowser.Server.Implementations.Persistence
             }
             if (query.ExcludeLocationTypes.Length == 1)
             {
-                whereClauses.Add("LocationType<>@ExcludeLocationTypes");
-                cmd.Parameters.Add(cmd, "@ExcludeLocationTypes", DbType.String).Value = query.ExcludeLocationTypes[0].ToString();
+                if (query.ExcludeLocationTypes[0] == LocationType.Virtual && _config.Configuration.SchemaVersion >= 90)
+                {
+                    query.IsVirtualItem = false;
+                }
+                else
+                {
+                    whereClauses.Add("LocationType<>@ExcludeLocationTypes");
+                    cmd.Parameters.Add(cmd, "@ExcludeLocationTypes", DbType.String).Value = query.ExcludeLocationTypes[0].ToString();
+                }
             }
             else if (query.ExcludeLocationTypes.Length > 1)
             {
@@ -2655,6 +2967,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
                 whereClauses.Add("LocationType not in (" + val + ")");
             }
+            if (query.IsVirtualItem.HasValue)
+            {
+                whereClauses.Add("IsVirtualItem=@IsVirtualItem");
+                cmd.Parameters.Add(cmd, "@IsVirtualItem", DbType.Boolean).Value = query.IsVirtualItem.Value;
+            }
             if (query.MediaTypes.Length == 1)
             {
                 whereClauses.Add("MediaType=@MediaTypes");
@@ -2666,6 +2983,73 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
                 whereClauses.Add("MediaType in (" + val + ")");
             }
+            if (query.ItemIds.Length > 0)
+            {
+                var excludeIds = new List<string>();
+
+                var index = 0;
+                foreach (var id in query.ItemIds)
+                {
+                    excludeIds.Add("Guid = @IncludeId" + index);
+                    cmd.Parameters.Add(cmd, "@IncludeId" + index, DbType.Guid).Value = new Guid(id);
+                    index++;
+                }
+
+                whereClauses.Add(string.Join(" OR ", excludeIds.ToArray()));
+            }
+            if (query.ExcludeItemIds.Length > 0)
+            {
+                var excludeIds = new List<string>();
+
+                var index = 0;
+                foreach (var id in query.ExcludeItemIds)
+                {
+                    excludeIds.Add("Guid <> @ExcludeId" + index);
+                    cmd.Parameters.Add(cmd, "@ExcludeId" + index, DbType.Guid).Value = new Guid(id);
+                    index++;
+                }
+
+                whereClauses.Add(string.Join(" AND ", excludeIds.ToArray()));
+            }
+
+            if (query.ExcludeProviderIds.Count > 0)
+            {
+                var excludeIds = new List<string>();
+
+                var index = 0;
+                foreach (var pair in query.ExcludeProviderIds)
+                {
+                    if (string.Equals(pair.Key, MetadataProviders.TmdbCollection.ToString(), StringComparison.OrdinalIgnoreCase))
+                    {
+                        continue;
+                    }
+
+                    var paramName = "@ExcludeProviderId" + index;
+                    excludeIds.Add("(COALESCE((select value from ProviderIds where ItemId=Guid and Name = '" + pair.Key + "'), '') <> " + paramName + ")");
+                    cmd.Parameters.Add(cmd, paramName, DbType.String).Value = pair.Value;
+                    index++;
+                }
+
+                whereClauses.Add(string.Join(" AND ", excludeIds.ToArray()));
+            }
+
+            if (query.HasImdbId.HasValue)
+            {
+                var fn = query.HasImdbId.Value ? "<>" : "=";
+                whereClauses.Add("(COALESCE((select value from ProviderIds where ItemId=Guid and Name = 'Imdb'), '') " + fn + " '')");
+            }
+
+            if (query.HasTmdbId.HasValue)
+            {
+                var fn = query.HasTmdbId.Value ? "<>" : "=";
+                whereClauses.Add("(COALESCE((select value from ProviderIds where ItemId=Guid and Name = 'Tmdb'), '') " + fn + " '')");
+            }
+
+            if (query.HasTvdbId.HasValue)
+            {
+                var fn = query.HasTvdbId.Value ? "<>" : "=";
+                whereClauses.Add("(COALESCE((select value from ProviderIds where ItemId=Guid and Name = 'Tvdb'), '') " + fn + " '')");
+            }
 
             if (query.AlbumNames.Length > 0)
             {
@@ -3077,6 +3461,16 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 _deleteItemValuesCommand.Transaction = transaction;
                 _deleteItemValuesCommand.ExecuteNonQuery();
 
+                // Delete provider ids
+                _deleteProviderIdsCommand.GetParameter(0).Value = id;
+                _deleteProviderIdsCommand.Transaction = transaction;
+                _deleteProviderIdsCommand.ExecuteNonQuery();
+
+                // Delete images
+                _deleteImagesCommand.GetParameter(0).Value = id;
+                _deleteImagesCommand.Transaction = transaction;
+                _deleteImagesCommand.ExecuteNonQuery();
+
                 // Delete the item
                 _deleteItemCommand.GetParameter(0).Value = id;
                 _deleteItemCommand.Transaction = transaction;
@@ -3269,7 +3663,311 @@ namespace MediaBrowser.Server.Implementations.Persistence
             }
         }
 
-        private List<Tuple<int, string>> GetItemValues(BaseItem item)
+        public QueryResult<Tuple<BaseItem, ItemCounts>> GetArtists(InternalItemsQuery query)
+        {
+            return GetItemValues(query, 0, typeof(MusicArtist).FullName);
+        }
+
+        public QueryResult<Tuple<BaseItem, ItemCounts>> GetAlbumArtists(InternalItemsQuery query)
+        {
+            return GetItemValues(query, 1, typeof(MusicArtist).FullName);
+        }
+
+        public QueryResult<Tuple<BaseItem, ItemCounts>> GetStudios(InternalItemsQuery query)
+        {
+            return GetItemValues(query, 3, typeof(Studio).FullName);
+        }
+
+        public QueryResult<Tuple<BaseItem, ItemCounts>> GetGenres(InternalItemsQuery query)
+        {
+            return GetItemValues(query, 2, typeof(Genre).FullName);
+        }
+
+        public QueryResult<Tuple<BaseItem, ItemCounts>> GetGameGenres(InternalItemsQuery query)
+        {
+            return GetItemValues(query, 2, typeof(GameGenre).FullName);
+        }
+
+        public QueryResult<Tuple<BaseItem, ItemCounts>> GetMusicGenres(InternalItemsQuery query)
+        {
+            return GetItemValues(query, 2, typeof(MusicGenre).FullName);
+        }
+
+        private QueryResult<Tuple<BaseItem, ItemCounts>> GetItemValues(InternalItemsQuery query, int itemValueType, string returnType)
+        {
+            if (query == null)
+            {
+                throw new ArgumentNullException("query");
+            }
+
+            if (!query.Limit.HasValue)
+            {
+                query.EnableTotalRecordCount = false;
+            }
+
+            CheckDisposed();
+
+            var now = DateTime.UtcNow;
+
+            using (var cmd = _connection.CreateCommand())
+            {
+                var itemCountColumns = new List<Tuple<string, string>>();
+
+                var typesToCount = query.IncludeItemTypes.ToList();
+
+                if (typesToCount.Count > 0)
+                {
+                    var itemCountColumnQuery = "select group_concat(type, '|')" + GetFromText("B");
+
+                    var typeSubQuery = new InternalItemsQuery(query.User)
+                    {
+                        ExcludeItemTypes = query.ExcludeItemTypes,
+                        IncludeItemTypes = query.IncludeItemTypes,
+                        MediaTypes = query.MediaTypes,
+                        AncestorIds = query.AncestorIds,
+                        ExcludeItemIds = query.ExcludeItemIds,
+                        ItemIds = query.ItemIds,
+                        TopParentIds = query.TopParentIds,
+                        ParentId = query.ParentId,
+                        IsPlayed = query.IsPlayed
+                    };
+                    var whereClauses = GetWhereClauses(typeSubQuery, cmd, "itemTypes");
+
+                    whereClauses.Add("guid in (select ItemId from ItemValues where ItemValues.CleanValue=A.CleanName AND Type=@ItemValueType)");
+
+                    var typeWhereText = whereClauses.Count == 0 ?
+                        string.Empty :
+                        " where " + string.Join(" AND ", whereClauses.ToArray());
+
+                    itemCountColumnQuery += typeWhereText;
+
+                    //itemCountColumnQuery += ")";
+
+                    itemCountColumns.Add(new Tuple<string, string>("itemTypes", "(" + itemCountColumnQuery + ") as itemTypes"));
+                }
+
+                var columns = _retriveItemColumns.ToList();
+                columns.AddRange(itemCountColumns.Select(i => i.Item2).ToArray());
+
+                cmd.CommandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, columns.ToArray(), cmd)) + GetFromText();
+                cmd.CommandText += GetJoinUserDataText(query);
+
+                var innerQuery = new InternalItemsQuery(query.User)
+                {
+                    ExcludeItemTypes = query.ExcludeItemTypes,
+                    IncludeItemTypes = query.IncludeItemTypes,
+                    MediaTypes = query.MediaTypes,
+                    AncestorIds = query.AncestorIds,
+                    ExcludeItemIds = query.ExcludeItemIds,
+                    ItemIds = query.ItemIds,
+                    TopParentIds = query.TopParentIds,
+                    ParentId = query.ParentId,
+                    IsPlayed = query.IsPlayed
+                };
+
+                var innerWhereClauses = GetWhereClauses(innerQuery, cmd);
+
+                var innerWhereText = innerWhereClauses.Count == 0 ?
+                    string.Empty :
+                    " where " + string.Join(" AND ", innerWhereClauses.ToArray());
+
+                var whereText = " where Type=@SelectType";
+
+                if (typesToCount.Count == 0)
+                {
+                    whereText += " And CleanName In (Select CleanValue from ItemValues where Type=@ItemValueType AND ItemId in (select guid from TypedBaseItems" + innerWhereText + "))";
+                }
+                else
+                {
+                    //whereText += " And itemTypes not null";
+                    whereText += " And CleanName In (Select CleanValue from ItemValues where Type=@ItemValueType AND ItemId in (select guid from TypedBaseItems" + innerWhereText + "))";
+                }
+
+                var outerQuery = new InternalItemsQuery(query.User)
+                {
+                    IsFavorite = query.IsFavorite,
+                    IsFavoriteOrLiked = query.IsFavoriteOrLiked,
+                    IsLiked = query.IsLiked,
+                    IsLocked = query.IsLocked,
+                    NameLessThan = query.NameLessThan,
+                    NameStartsWith = query.NameStartsWith,
+                    NameStartsWithOrGreater = query.NameStartsWithOrGreater,
+                    AlbumArtistStartsWithOrGreater = query.AlbumArtistStartsWithOrGreater,
+                    Tags = query.Tags,
+                    OfficialRatings = query.OfficialRatings,
+                    Genres = query.GenreIds,
+                    Years = query.Years
+                };
+
+                var outerWhereClauses = GetWhereClauses(outerQuery, cmd);
+
+                whereText += outerWhereClauses.Count == 0 ?
+                    string.Empty :
+                    " AND " + string.Join(" AND ", outerWhereClauses.ToArray());
+                //cmd.CommandText += GetGroupBy(query);
+
+                cmd.CommandText += whereText;
+                cmd.CommandText += " group by PresentationUniqueKey";
+
+                cmd.Parameters.Add(cmd, "@SelectType", DbType.String).Value = returnType;
+                cmd.Parameters.Add(cmd, "@ItemValueType", DbType.Int32).Value = itemValueType;
+
+                if (EnableJoinUserData(query))
+                {
+                    cmd.Parameters.Add(cmd, "@UserId", DbType.Guid).Value = query.User.Id;
+                }
+
+                cmd.CommandText += " order by SortName";
+
+                if (query.Limit.HasValue || query.StartIndex.HasValue)
+                {
+                    var offset = query.StartIndex ?? 0;
+
+                    if (query.Limit.HasValue || offset > 0)
+                    {
+                        cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture);
+                    }
+
+                    if (offset > 0)
+                    {
+                        cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture);
+                    }
+                }
+
+                cmd.CommandText += ";";
+
+                var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0;
+
+                if (isReturningZeroItems)
+                {
+                    cmd.CommandText = "";
+                }
+
+                if (query.EnableTotalRecordCount)
+                {
+                    cmd.CommandText += "select count (distinct PresentationUniqueKey)" + GetFromText();
+
+                    cmd.CommandText += GetJoinUserDataText(query);
+                    cmd.CommandText += whereText;
+                }
+                else
+                {
+                    cmd.CommandText = cmd.CommandText.TrimEnd(';');
+                }
+
+                var list = new List<Tuple<BaseItem, ItemCounts>>();
+                var count = 0;
+
+                var commandBehavior = isReturningZeroItems || !query.EnableTotalRecordCount
+                    ? (CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)
+                    : CommandBehavior.SequentialAccess;
+
+                Logger.Debug("GetItemValues: " + cmd.CommandText);
+
+                using (var reader = cmd.ExecuteReader(commandBehavior))
+                {
+                    LogQueryTime("GetItemValues", cmd, now);
+
+                    if (isReturningZeroItems)
+                    {
+                        if (reader.Read())
+                        {
+                            count = reader.GetInt32(0);
+                        }
+                    }
+                    else
+                    {
+                        while (reader.Read())
+                        {
+                            var item = GetItem(reader);
+                            if (item != null)
+                            {
+                                var countStartColumn = columns.Count - 1;
+
+                                list.Add(new Tuple<BaseItem, ItemCounts>(item, GetItemCounts(reader, countStartColumn, typesToCount)));
+                            }
+                        }
+
+                        if (reader.NextResult() && reader.Read())
+                        {
+                            count = reader.GetInt32(0);
+                        }
+                    }
+                }
+
+                if (count == 0)
+                {
+                    count = list.Count;
+                }
+
+                return new QueryResult<Tuple<BaseItem, ItemCounts>>
+                {
+                    Items = list.ToArray(),
+                    TotalRecordCount = count
+                };
+
+            }
+        }
+
+        private ItemCounts GetItemCounts(IDataReader reader, int countStartColumn, List<string> typesToCount)
+        {
+            var counts = new ItemCounts();
+
+            if (typesToCount.Count == 0)
+            {
+                return counts;
+            }
+
+            var typeString = reader.IsDBNull(countStartColumn) ? null : reader.GetString(countStartColumn);
+
+            if (string.IsNullOrWhiteSpace(typeString))
+            {
+                return counts;
+            }
+
+            var allTypes = typeString.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries)
+                .ToLookup(i => i).ToList();
+
+            foreach (var type in allTypes)
+            {
+                var value = type.ToList().Count;
+                var typeName = type.Key;
+
+                if (string.Equals(typeName, typeof(Series).FullName, StringComparison.OrdinalIgnoreCase))
+                {
+                    counts.SeriesCount = value;
+                }
+                else if (string.Equals(typeName, typeof(Episode).FullName, StringComparison.OrdinalIgnoreCase))
+                {
+                    counts.EpisodeCount = value;
+                }
+                else if (string.Equals(typeName, typeof(Movie).FullName, StringComparison.OrdinalIgnoreCase))
+                {
+                    counts.MovieCount = value;
+                }
+                else if (string.Equals(typeName, typeof(MusicAlbum).FullName, StringComparison.OrdinalIgnoreCase))
+                {
+                    counts.AlbumCount = value;
+                }
+                else if (string.Equals(typeName, typeof(Audio).FullName, StringComparison.OrdinalIgnoreCase))
+                {
+                    counts.SongCount = value;
+                }
+                else if (string.Equals(typeName, typeof(Game).FullName, StringComparison.OrdinalIgnoreCase))
+                {
+                    counts.GameCount = value;
+                }
+                else if (string.Equals(typeName, typeof(Trailer).FullName, StringComparison.OrdinalIgnoreCase))
+                {
+                    counts.TrailerCount = value;
+                }
+                counts.ItemCount += value;
+            }
+
+            return counts;
+        }
+
+        private List<Tuple<int, string>> GetItemValuesToSave(BaseItem item)
         {
             var list = new List<Tuple<int, string>>();
 
@@ -3285,9 +3983,91 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 list.AddRange(hasAlbumArtist.AlbumArtists.Select(i => new Tuple<int, string>(1, i)));
             }
 
+            list.AddRange(item.Genres.Select(i => new Tuple<int, string>(2, i)));
+            list.AddRange(item.Studios.Select(i => new Tuple<int, string>(3, i)));
+            list.AddRange(item.Tags.Select(i => new Tuple<int, string>(4, i)));
+            list.AddRange(item.Keywords.Select(i => new Tuple<int, string>(5, i)));
+
             return list;
         }
 
+        private void UpdateImages(Guid itemId, List<ItemImageInfo> images, IDbTransaction transaction)
+        {
+            if (itemId == Guid.Empty)
+            {
+                throw new ArgumentNullException("itemId");
+            }
+
+            if (images == null)
+            {
+                throw new ArgumentNullException("images");
+            }
+
+            CheckDisposed();
+
+            // First delete 
+            _deleteImagesCommand.GetParameter(0).Value = itemId;
+            _deleteImagesCommand.Transaction = transaction;
+
+            _deleteImagesCommand.ExecuteNonQuery();
+
+            var index = 0;
+            foreach (var image in images)
+            {
+                _saveImagesCommand.GetParameter(0).Value = itemId;
+                _saveImagesCommand.GetParameter(1).Value = image.Type;
+                _saveImagesCommand.GetParameter(2).Value = image.Path;
+
+                if (image.DateModified == default(DateTime))
+                {
+                    _saveImagesCommand.GetParameter(3).Value = null;
+                }
+                else
+                {
+                    _saveImagesCommand.GetParameter(3).Value = image.DateModified;
+                }
+
+                _saveImagesCommand.GetParameter(4).Value = image.IsPlaceholder;
+                _saveImagesCommand.GetParameter(5).Value = index;
+
+                _saveImagesCommand.Transaction = transaction;
+
+                _saveImagesCommand.ExecuteNonQuery();
+                index++;
+            }
+        }
+
+        private void UpdateProviderIds(Guid itemId, Dictionary<string, string> values, IDbTransaction transaction)
+        {
+            if (itemId == Guid.Empty)
+            {
+                throw new ArgumentNullException("itemId");
+            }
+
+            if (values == null)
+            {
+                throw new ArgumentNullException("values");
+            }
+
+            CheckDisposed();
+
+            // First delete 
+            _deleteProviderIdsCommand.GetParameter(0).Value = itemId;
+            _deleteProviderIdsCommand.Transaction = transaction;
+
+            _deleteProviderIdsCommand.ExecuteNonQuery();
+
+            foreach (var pair in values)
+            {
+                _saveProviderIdsCommand.GetParameter(0).Value = itemId;
+                _saveProviderIdsCommand.GetParameter(1).Value = pair.Key;
+                _saveProviderIdsCommand.GetParameter(2).Value = pair.Value;
+                _saveProviderIdsCommand.Transaction = transaction;
+
+                _saveProviderIdsCommand.ExecuteNonQuery();
+            }
+        }
+
         private void UpdateItemValues(Guid itemId, List<Tuple<int, string>> values, IDbTransaction transaction)
         {
             if (itemId == Guid.Empty)
@@ -3313,6 +4093,14 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 _saveItemValuesCommand.GetParameter(0).Value = itemId;
                 _saveItemValuesCommand.GetParameter(1).Value = pair.Item1;
                 _saveItemValuesCommand.GetParameter(2).Value = pair.Item2;
+                if (pair.Item2 == null)
+                {
+                    _saveItemValuesCommand.GetParameter(3).Value = null;
+                }
+                else
+                {
+                    _saveItemValuesCommand.GetParameter(3).Value = pair.Item2.RemoveDiacritics();
+                }
                 _saveItemValuesCommand.Transaction = transaction;
 
                 _saveItemValuesCommand.ExecuteNonQuery();
@@ -3505,7 +4293,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
             return list;
         }
 
-        public async Task SaveMediaStreams(Guid id, IEnumerable<MediaStream> streams, CancellationToken cancellationToken)
+        public async Task SaveMediaStreams(Guid id, List<MediaStream> streams, CancellationToken cancellationToken)
         {
             CheckDisposed();
 
@@ -3578,6 +4366,9 @@ namespace MediaBrowser.Server.Implementations.Persistence
                     _saveStreamCommand.GetParameter(index++).Value = stream.IsAVC;
                     _saveStreamCommand.GetParameter(index++).Value = stream.Title;
 
+                    _saveStreamCommand.GetParameter(index++).Value = stream.TimeBase;
+                    _saveStreamCommand.GetParameter(index++).Value = stream.CodecTimeBase;
+
                     _saveStreamCommand.Transaction = transaction;
                     _saveStreamCommand.ExecuteNonQuery();
                 }
@@ -3750,6 +4541,16 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 item.Title = reader.GetString(29);
             }
 
+            if (!reader.IsDBNull(30))
+            {
+                item.TimeBase = reader.GetString(30);
+            }
+
+            if (!reader.IsDBNull(31))
+            {
+                item.CodecTimeBase = reader.GetString(31);
+            }
+
             return item;
         }
 
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteProviderInfoRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteProviderInfoRepository.cs
deleted file mode 100644
index 40d5c9586..000000000
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteProviderInfoRepository.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Logging;
-using System;
-using System.Data;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Server.Implementations.Persistence
-{
-    public class SqliteProviderInfoRepository : BaseSqliteRepository, IProviderRepository
-    {
-        private IDbConnection _connection;
-
-        private IDbCommand _saveStatusCommand;
-        private readonly IApplicationPaths _appPaths;
-
-        public SqliteProviderInfoRepository(ILogManager logManager, IApplicationPaths appPaths) : base(logManager)
-        {
-            _appPaths = appPaths;
-        }
-
-        /// <summary>
-        /// Gets the name of the repository
-        /// </summary>
-        /// <value>The name.</value>
-        public string Name
-        {
-            get
-            {
-                return "SQLite";
-            }
-        }
-
-        /// <summary>
-        /// Opens the connection to the database
-        /// </summary>
-        /// <returns>Task.</returns>
-        public async Task Initialize(IDbConnector dbConnector)
-        {
-            var dbFile = Path.Combine(_appPaths.DataPath, "refreshinfo.db");
-
-            _connection = await dbConnector.Connect(dbFile).ConfigureAwait(false);
-
-            string[] queries = {
-
-                                "create table if not exists MetadataStatus (ItemId GUID PRIMARY KEY, DateLastMetadataRefresh datetime, DateLastImagesRefresh datetime, ItemDateModified DateTimeNull)",
-                                "create index if not exists idx_MetadataStatus on MetadataStatus(ItemId)",
-
-                                //pragmas
-                                "pragma temp_store = memory",
-
-                                "pragma shrink_memory"
-                               };
-
-            _connection.RunQueries(queries, Logger);
-
-            AddItemDateModifiedCommand();
-
-            PrepareStatements();
-        }
-
-        private static readonly string[] StatusColumns =
-        {
-            "ItemId",
-            "DateLastMetadataRefresh",
-            "DateLastImagesRefresh",
-            "ItemDateModified"
-        };
-
-        private void AddItemDateModifiedCommand()
-        {
-            using (var cmd = _connection.CreateCommand())
-            {
-                cmd.CommandText = "PRAGMA table_info(MetadataStatus)";
-
-                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult))
-                {
-                    while (reader.Read())
-                    {
-                        if (!reader.IsDBNull(1))
-                        {
-                            var name = reader.GetString(1);
-
-                            if (string.Equals(name, "ItemDateModified", StringComparison.OrdinalIgnoreCase))
-                            {
-                                return;
-                            }
-                        }
-                    }
-                }
-            }
-
-            var builder = new StringBuilder();
-
-            builder.AppendLine("alter table MetadataStatus");
-            builder.AppendLine("add column ItemDateModified DateTime NULL");
-
-            _connection.RunQueries(new[] { builder.ToString() }, Logger);
-        }
-        
-        /// <summary>
-        /// Prepares the statements.
-        /// </summary>
-        private void PrepareStatements()
-        {
-            _saveStatusCommand = _connection.CreateCommand();
-
-            _saveStatusCommand.CommandText = string.Format("replace into MetadataStatus ({0}) values ({1})",
-                string.Join(",", StatusColumns),
-                string.Join(",", StatusColumns.Select(i => "@" + i).ToArray()));
-
-            foreach (var col in StatusColumns)
-            {
-                _saveStatusCommand.Parameters.Add(_saveStatusCommand, "@" + col);
-            }
-        }
-
-        public MetadataStatus GetMetadataStatus(Guid itemId)
-        {
-            if (itemId == Guid.Empty)
-            {
-                throw new ArgumentNullException("itemId");
-            }
-
-            using (var cmd = _connection.CreateCommand())
-            {
-                var cmdText = "select " + string.Join(",", StatusColumns) + " from MetadataStatus where";
-
-                cmdText += " ItemId=@ItemId";
-                cmd.Parameters.Add(cmd, "@ItemId", DbType.Guid).Value = itemId;
-
-                cmd.CommandText = cmdText;
-
-                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
-                {
-                    while (reader.Read())
-                    {
-                        return GetStatus(reader);
-                    }
-
-                    return null;
-                }
-            }
-        }
-
-        private MetadataStatus GetStatus(IDataReader reader)
-        {
-            var result = new MetadataStatus
-            {
-                ItemId = reader.GetGuid(0)
-            };
-
-            if (!reader.IsDBNull(1))
-            {
-                result.DateLastMetadataRefresh = reader.GetDateTime(1).ToUniversalTime();
-            }
-
-            if (!reader.IsDBNull(2))
-            {
-                result.DateLastImagesRefresh = reader.GetDateTime(2).ToUniversalTime();
-            }
-
-            if (!reader.IsDBNull(3))
-            {
-                result.ItemDateModified = reader.GetDateTime(3).ToUniversalTime();
-            }
-
-            return result;
-        }
-
-        public async Task SaveMetadataStatus(MetadataStatus status, CancellationToken cancellationToken)
-        {
-            if (status == null)
-            {
-                throw new ArgumentNullException("status");
-            }
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false);
-
-            IDbTransaction transaction = null;
-
-            try
-            {
-                transaction = _connection.BeginTransaction();
-                
-                _saveStatusCommand.GetParameter(0).Value = status.ItemId;
-                _saveStatusCommand.GetParameter(1).Value = status.DateLastMetadataRefresh;
-                _saveStatusCommand.GetParameter(2).Value = status.DateLastImagesRefresh;
-                _saveStatusCommand.GetParameter(3).Value = status.ItemDateModified;
-
-                _saveStatusCommand.Transaction = transaction;
-
-                _saveStatusCommand.ExecuteNonQuery();
-
-                transaction.Commit();
-            }
-            catch (OperationCanceledException)
-            {
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
-
-                throw;
-            }
-            catch (Exception e)
-            {
-                Logger.ErrorException("Failed to save provider info:", e);
-
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
-
-                throw;
-            }
-            finally
-            {
-                if (transaction != null)
-                {
-                    transaction.Dispose();
-                }
-
-                WriteLock.Release();
-            }
-        }
-
-        protected override void CloseConnection()
-        {
-            if (_connection != null)
-            {
-                if (_connection.IsOpen())
-                {
-                    _connection.Close();
-                }
-
-                _connection.Dispose();
-                _connection = null;
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs
index 7f3b32e06..62d9e7634 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs
@@ -5,7 +5,9 @@ using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Globalization;
 using System.IO;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -14,11 +16,15 @@ namespace MediaBrowser.Server.Implementations.Persistence
     public class SqliteUserDataRepository : BaseSqliteRepository, IUserDataRepository
     {
         private IDbConnection _connection;
-        private readonly IApplicationPaths _appPaths;
 
-        public SqliteUserDataRepository(ILogManager logManager, IApplicationPaths appPaths) : base(logManager)
+        public SqliteUserDataRepository(ILogManager logManager, IApplicationPaths appPaths, IDbConnector connector) : base(logManager, connector)
         {
-            _appPaths = appPaths;
+            DbFilePath = Path.Combine(appPaths.DataPath, "userdata_v2.db");
+        }
+
+        protected override bool EnableConnectionPooling
+        {
+            get { return false; }
         }
 
         /// <summary>
@@ -33,22 +39,42 @@ namespace MediaBrowser.Server.Implementations.Persistence
             }
         }
 
+        protected override async Task<IDbConnection> CreateConnection(bool isReadOnly = false)
+        {
+            var connection = await DbConnector.Connect(DbFilePath, false, false, 10000).ConfigureAwait(false);
+
+            connection.RunQueries(new[]
+            {
+                "pragma temp_store = memory"
+
+            }, Logger);
+
+            return connection;
+        }
+
         /// <summary>
         /// Opens the connection to the database
         /// </summary>
         /// <returns>Task.</returns>
-        public async Task Initialize(IDbConnector dbConnector)
+        public async Task Initialize(IDbConnection connection, SemaphoreSlim writeLock)
         {
-            var dbFile = Path.Combine(_appPaths.DataPath, "userdata_v2.db");
-
-            _connection = await dbConnector.Connect(dbFile).ConfigureAwait(false);
+            WriteLock.Dispose();
+            WriteLock = writeLock;
+            _connection = connection;
 
             string[] queries = {
 
-                                "create table if not exists userdata (key nvarchar, userId GUID, rating float null, played bit, playCount int, isFavorite bit, playbackPositionTicks bigint, lastPlayedDate datetime null)",
+                                "create table if not exists UserDataDb.userdata (key nvarchar, userId GUID, rating float null, played bit, playCount int, isFavorite bit, playbackPositionTicks bigint, lastPlayedDate datetime null)",
+
+                                "drop index if exists UserDataDb.idx_userdata",
+                                "drop index if exists UserDataDb.idx_userdata1",
+                                "drop index if exists UserDataDb.idx_userdata2",
+                                "drop index if exists UserDataDb.userdataindex1",
 
-                                "create index if not exists idx_userdata on userdata(key)",
-                                "create unique index if not exists userdataindex on userdata (key, userId)",
+                                "create unique index if not exists UserDataDb.userdataindex on userdata (key, userId)",
+                                "create index if not exists UserDataDb.userdataindex2 on userdata (key, userId, played)",
+                                "create index if not exists UserDataDb.userdataindex3 on userdata (key, userId, playbackPositionTicks)",
+                                "create index if not exists UserDataDb.userdataindex4 on userdata (key, userId, isFavorite)",
 
                                 //pragmas
                                 "pragma temp_store = memory",
@@ -300,6 +326,53 @@ namespace MediaBrowser.Server.Implementations.Persistence
             }
         }
 
+        public UserItemData GetUserData(Guid userId, List<string> keys)
+        {
+            if (userId == Guid.Empty)
+            {
+                throw new ArgumentNullException("userId");
+            }
+            if (keys == null)
+            {
+                throw new ArgumentNullException("keys");
+            }
+
+            using (var cmd = _connection.CreateCommand())
+            {
+                var index = 0;
+                var userdataKeys = new List<string>();
+                var builder = new StringBuilder();
+                foreach (var key in keys)
+                {
+                    var paramName = "@Key" + index;
+                    userdataKeys.Add("Key =" + paramName);
+                    cmd.Parameters.Add(cmd, paramName, DbType.String).Value = key;
+                    builder.Append(" WHEN Key=" + paramName + " THEN " + index);
+                    index++;
+                    break;
+                }
+
+                var keyText = string.Join(" OR ", userdataKeys.ToArray());
+
+                cmd.CommandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=@userId AND (" + keyText + ") ";
+
+                cmd.CommandText += " ORDER BY (Case " + builder + " Else " + keys.Count.ToString(CultureInfo.InvariantCulture) + " End )";
+                cmd.CommandText += " LIMIT 1";
+
+                cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId;
+
+                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
+                {
+                    if (reader.Read())
+                    {
+                        return ReadRow(reader);
+                    }
+                }
+
+                return null;
+            }
+        }
+
         /// <summary>
         /// Return all user-data associated with the given user
         /// </summary>
@@ -367,18 +440,14 @@ namespace MediaBrowser.Server.Implementations.Persistence
             return userData;
         }
 
-        protected override void CloseConnection()
+        protected override void Dispose(bool dispose)
         {
-            if (_connection != null)
-            {
-                if (_connection.IsOpen())
-                {
-                    _connection.Close();
-                }
+            // handled by library database
+        }
 
-                _connection.Dispose();
-                _connection = null;
-            }
+        protected override void CloseConnection()
+        {
+            // handled by library database
         }
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteUserRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteUserRepository.cs
index f7ca39a54..25ab60ca5 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteUserRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteUserRepository.cs
@@ -17,14 +17,13 @@ namespace MediaBrowser.Server.Implementations.Persistence
     /// </summary>
     public class SqliteUserRepository : BaseSqliteRepository, IUserRepository
     {
-        private IDbConnection _connection;
-        private readonly IServerApplicationPaths _appPaths;
         private readonly IJsonSerializer _jsonSerializer;
 
-        public SqliteUserRepository(ILogManager logManager, IServerApplicationPaths appPaths, IJsonSerializer jsonSerializer) : base(logManager)
+        public SqliteUserRepository(ILogManager logManager, IServerApplicationPaths appPaths, IJsonSerializer jsonSerializer, IDbConnector dbConnector) : base(logManager, dbConnector)
         {
-            _appPaths = appPaths;
             _jsonSerializer = jsonSerializer;
+
+            DbFilePath = Path.Combine(appPaths.DataPath, "users.db");
         }
 
         /// <summary>
@@ -43,25 +42,21 @@ namespace MediaBrowser.Server.Implementations.Persistence
         /// Opens the connection to the database
         /// </summary>
         /// <returns>Task.</returns>
-        public async Task Initialize(IDbConnector dbConnector)
+        public async Task Initialize()
         {
-            var dbFile = Path.Combine(_appPaths.DataPath, "users.db");
-
-            _connection = await dbConnector.Connect(dbFile).ConfigureAwait(false);
-
-            string[] queries = {
+            using (var connection = await CreateConnection().ConfigureAwait(false))
+            {
+                string[] queries = {
 
                                 "create table if not exists users (guid GUID primary key, data BLOB)",
                                 "create index if not exists idx_users on users(guid)",
                                 "create table if not exists schema_version (table_name primary key, version)",
 
-                                //pragmas
-                                "pragma temp_store = memory",
-
                                 "pragma shrink_memory"
                                };
 
-            _connection.RunQueries(queries, Logger);
+                connection.RunQueries(queries, Logger);
+            }
         }
 
         /// <summary>
@@ -84,55 +79,54 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false);
-            
-            IDbTransaction transaction = null;
-
-            try
+            using (var connection = await CreateConnection().ConfigureAwait(false))
             {
-                transaction = _connection.BeginTransaction();
+                IDbTransaction transaction = null;
 
-                using (var cmd = _connection.CreateCommand())
+                try
                 {
-                    cmd.CommandText = "replace into users (guid, data) values (@1, @2)";
-                    cmd.Parameters.Add(cmd, "@1", DbType.Guid).Value = user.Id;
-                    cmd.Parameters.Add(cmd, "@2", DbType.Binary).Value = serialized;
+                    transaction = connection.BeginTransaction();
+
+                    using (var cmd = connection.CreateCommand())
+                    {
+                        cmd.CommandText = "replace into users (guid, data) values (@1, @2)";
+                        cmd.Parameters.Add(cmd, "@1", DbType.Guid).Value = user.Id;
+                        cmd.Parameters.Add(cmd, "@2", DbType.Binary).Value = serialized;
 
-                    cmd.Transaction = transaction;
+                        cmd.Transaction = transaction;
 
-                    cmd.ExecuteNonQuery();
-                }
+                        cmd.ExecuteNonQuery();
+                    }
 
-                transaction.Commit();
-            }
-            catch (OperationCanceledException)
-            {
-                if (transaction != null)
+                    transaction.Commit();
+                }
+                catch (OperationCanceledException)
                 {
-                    transaction.Rollback();
+                    if (transaction != null)
+                    {
+                        transaction.Rollback();
+                    }
+
+                    throw;
                 }
+                catch (Exception e)
+                {
+                    Logger.ErrorException("Failed to save user:", e);
 
-                throw;
-            }
-            catch (Exception e)
-            {
-                Logger.ErrorException("Failed to save user:", e);
+                    if (transaction != null)
+                    {
+                        transaction.Rollback();
+                    }
 
-                if (transaction != null)
-                {
-                    transaction.Rollback();
+                    throw;
                 }
-
-                throw;
-            }
-            finally
-            {
-                if (transaction != null)
+                finally
                 {
-                    transaction.Dispose();
+                    if (transaction != null)
+                    {
+                        transaction.Dispose();
+                    }
                 }
-
-                WriteLock.Release();
             }
         }
 
@@ -142,25 +136,32 @@ namespace MediaBrowser.Server.Implementations.Persistence
         /// <returns>IEnumerable{User}.</returns>
         public IEnumerable<User> RetrieveAllUsers()
         {
-            using (var cmd = _connection.CreateCommand())
-            {
-                cmd.CommandText = "select guid,data from users";
+            var list = new List<User>();
 
-                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult))
+            using (var connection = CreateConnection(true).Result)
+            {
+                using (var cmd = connection.CreateCommand())
                 {
-                    while (reader.Read())
-                    {
-                        var id = reader.GetGuid(0);
+                    cmd.CommandText = "select guid,data from users";
 
-                        using (var stream = reader.GetMemoryStream(1))
+                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult))
+                    {
+                        while (reader.Read())
                         {
-                            var user = _jsonSerializer.DeserializeFromStream<User>(stream);
-                            user.Id = id;
-                            yield return user;
+                            var id = reader.GetGuid(0);
+
+                            using (var stream = reader.GetMemoryStream(1))
+                            {
+                                var user = _jsonSerializer.DeserializeFromStream<User>(stream);
+                                user.Id = id;
+                                list.Add(user);
+                            }
                         }
                     }
                 }
             }
+
+            return list;
         }
 
         /// <summary>
@@ -179,69 +180,54 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false);
-
-            IDbTransaction transaction = null;
-
-            try
+            using (var connection = await CreateConnection().ConfigureAwait(false))
             {
-                transaction = _connection.BeginTransaction();
+                IDbTransaction transaction = null;
 
-                using (var cmd = _connection.CreateCommand())
+                try
                 {
-                    cmd.CommandText = "delete from users where guid=@guid";
+                    transaction = connection.BeginTransaction();
 
-                    cmd.Parameters.Add(cmd, "@guid", DbType.Guid).Value = user.Id;
-
-                    cmd.Transaction = transaction;
+                    using (var cmd = connection.CreateCommand())
+                    {
+                        cmd.CommandText = "delete from users where guid=@guid";
 
-                    cmd.ExecuteNonQuery();
-                }
+                        cmd.Parameters.Add(cmd, "@guid", DbType.Guid).Value = user.Id;
 
-                transaction.Commit();
-            }
-            catch (OperationCanceledException)
-            {
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
+                        cmd.Transaction = transaction;
 
-                throw;
-            }
-            catch (Exception e)
-            {
-                Logger.ErrorException("Failed to delete user:", e);
+                        cmd.ExecuteNonQuery();
+                    }
 
-                if (transaction != null)
-                {
-                    transaction.Rollback();
+                    transaction.Commit();
                 }
-
-                throw;
-            }
-            finally
-            {
-                if (transaction != null)
+                catch (OperationCanceledException)
                 {
-                    transaction.Dispose();
+                    if (transaction != null)
+                    {
+                        transaction.Rollback();
+                    }
+
+                    throw;
                 }
+                catch (Exception e)
+                {
+                    Logger.ErrorException("Failed to delete user:", e);
 
-                WriteLock.Release();
-            }
-        }
+                    if (transaction != null)
+                    {
+                        transaction.Rollback();
+                    }
 
-        protected override void CloseConnection()
-        {
-            if (_connection != null)
-            {
-                if (_connection.IsOpen())
+                    throw;
+                }
+                finally
                 {
-                    _connection.Close();
+                    if (transaction != null)
+                    {
+                        transaction.Dispose();
+                    }
                 }
-
-                _connection.Dispose();
-                _connection = null;
             }
         }
     }
diff --git a/MediaBrowser.Server.Implementations/Security/AuthenticationRepository.cs b/MediaBrowser.Server.Implementations/Security/AuthenticationRepository.cs
index e8d9814ec..74a552dcc 100644
--- a/MediaBrowser.Server.Implementations/Security/AuthenticationRepository.cs
+++ b/MediaBrowser.Server.Implementations/Security/AuthenticationRepository.cs
@@ -15,57 +15,30 @@ namespace MediaBrowser.Server.Implementations.Security
 {
     public class AuthenticationRepository : BaseSqliteRepository, IAuthenticationRepository
     {
-        private IDbConnection _connection;
         private readonly IServerApplicationPaths _appPaths;
         private readonly CultureInfo _usCulture = new CultureInfo("en-US");
 
-        private IDbCommand _saveInfoCommand;
-
-        public AuthenticationRepository(ILogManager logManager, IServerApplicationPaths appPaths)
-            : base(logManager)
+        public AuthenticationRepository(ILogManager logManager, IServerApplicationPaths appPaths, IDbConnector connector)
+            : base(logManager, connector)
         {
             _appPaths = appPaths;
+            DbFilePath = Path.Combine(appPaths.DataPath, "authentication.db");
         }
 
-        public async Task Initialize(IDbConnector dbConnector)
+        public async Task Initialize()
         {
-            var dbFile = Path.Combine(_appPaths.DataPath, "authentication.db");
-
-            _connection = await dbConnector.Connect(dbFile).ConfigureAwait(false);
-
-            string[] queries = {
+            using (var connection = await CreateConnection().ConfigureAwait(false))
+            {
+                string[] queries = {
 
                                 "create table if not exists AccessTokens (Id GUID PRIMARY KEY, AccessToken TEXT NOT NULL, DeviceId TEXT, AppName TEXT, AppVersion TEXT, DeviceName TEXT, UserId TEXT, IsActive BIT, DateCreated DATETIME NOT NULL, DateRevoked DATETIME)",
-                                "create index if not exists idx_AccessTokens on AccessTokens(Id)",
-
-                                //pragmas
-                                "pragma temp_store = memory",
-
-                                "pragma shrink_memory"
+                                "create index if not exists idx_AccessTokens on AccessTokens(Id)"
                                };
 
-            _connection.RunQueries(queries, Logger);
+                connection.RunQueries(queries, Logger);
 
-            _connection.AddColumn(Logger, "AccessTokens", "AppVersion", "TEXT");
-
-            PrepareStatements();
-        }
-
-        private void PrepareStatements()
-        {
-            _saveInfoCommand = _connection.CreateCommand();
-            _saveInfoCommand.CommandText = "replace into AccessTokens (Id, AccessToken, DeviceId, AppName, AppVersion, DeviceName, UserId, IsActive, DateCreated, DateRevoked) values (@Id, @AccessToken, @DeviceId, @AppName, @AppVersion, @DeviceName, @UserId, @IsActive, @DateCreated, @DateRevoked)";
-
-            _saveInfoCommand.Parameters.Add(_saveInfoCommand, "@Id");
-            _saveInfoCommand.Parameters.Add(_saveInfoCommand, "@AccessToken");
-            _saveInfoCommand.Parameters.Add(_saveInfoCommand, "@DeviceId");
-            _saveInfoCommand.Parameters.Add(_saveInfoCommand, "@AppName");
-            _saveInfoCommand.Parameters.Add(_saveInfoCommand, "@AppVersion");
-            _saveInfoCommand.Parameters.Add(_saveInfoCommand, "@DeviceName");
-            _saveInfoCommand.Parameters.Add(_saveInfoCommand, "@UserId");
-            _saveInfoCommand.Parameters.Add(_saveInfoCommand, "@IsActive");
-            _saveInfoCommand.Parameters.Add(_saveInfoCommand, "@DateCreated");
-            _saveInfoCommand.Parameters.Add(_saveInfoCommand, "@DateRevoked");
+                connection.AddColumn(Logger, "AccessTokens", "AppVersion", "TEXT");
+            }
         }
 
         public Task Create(AuthenticationInfo info, CancellationToken cancellationToken)
@@ -84,61 +57,76 @@ namespace MediaBrowser.Server.Implementations.Security
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false);
-
-            IDbTransaction transaction = null;
-
-            try
+            using (var connection = await CreateConnection().ConfigureAwait(false))
             {
-                transaction = _connection.BeginTransaction();
+                using (var saveInfoCommand = connection.CreateCommand())
+                {
+                    saveInfoCommand.CommandText = "replace into AccessTokens (Id, AccessToken, DeviceId, AppName, AppVersion, DeviceName, UserId, IsActive, DateCreated, DateRevoked) values (@Id, @AccessToken, @DeviceId, @AppName, @AppVersion, @DeviceName, @UserId, @IsActive, @DateCreated, @DateRevoked)";
+
+                    saveInfoCommand.Parameters.Add(saveInfoCommand, "@Id");
+                    saveInfoCommand.Parameters.Add(saveInfoCommand, "@AccessToken");
+                    saveInfoCommand.Parameters.Add(saveInfoCommand, "@DeviceId");
+                    saveInfoCommand.Parameters.Add(saveInfoCommand, "@AppName");
+                    saveInfoCommand.Parameters.Add(saveInfoCommand, "@AppVersion");
+                    saveInfoCommand.Parameters.Add(saveInfoCommand, "@DeviceName");
+                    saveInfoCommand.Parameters.Add(saveInfoCommand, "@UserId");
+                    saveInfoCommand.Parameters.Add(saveInfoCommand, "@IsActive");
+                    saveInfoCommand.Parameters.Add(saveInfoCommand, "@DateCreated");
+                    saveInfoCommand.Parameters.Add(saveInfoCommand, "@DateRevoked");
+
+                    IDbTransaction transaction = null;
+
+                    try
+                    {
+                        transaction = connection.BeginTransaction();
 
-                var index = 0;
+                        var index = 0;
 
-                _saveInfoCommand.GetParameter(index++).Value = new Guid(info.Id);
-                _saveInfoCommand.GetParameter(index++).Value = info.AccessToken;
-                _saveInfoCommand.GetParameter(index++).Value = info.DeviceId;
-                _saveInfoCommand.GetParameter(index++).Value = info.AppName;
-                _saveInfoCommand.GetParameter(index++).Value = info.AppVersion;
-                _saveInfoCommand.GetParameter(index++).Value = info.DeviceName;
-                _saveInfoCommand.GetParameter(index++).Value = info.UserId;
-                _saveInfoCommand.GetParameter(index++).Value = info.IsActive;
-                _saveInfoCommand.GetParameter(index++).Value = info.DateCreated;
-                _saveInfoCommand.GetParameter(index++).Value = info.DateRevoked;
+                        saveInfoCommand.GetParameter(index++).Value = new Guid(info.Id);
+                        saveInfoCommand.GetParameter(index++).Value = info.AccessToken;
+                        saveInfoCommand.GetParameter(index++).Value = info.DeviceId;
+                        saveInfoCommand.GetParameter(index++).Value = info.AppName;
+                        saveInfoCommand.GetParameter(index++).Value = info.AppVersion;
+                        saveInfoCommand.GetParameter(index++).Value = info.DeviceName;
+                        saveInfoCommand.GetParameter(index++).Value = info.UserId;
+                        saveInfoCommand.GetParameter(index++).Value = info.IsActive;
+                        saveInfoCommand.GetParameter(index++).Value = info.DateCreated;
+                        saveInfoCommand.GetParameter(index++).Value = info.DateRevoked;
 
-                _saveInfoCommand.Transaction = transaction;
+                        saveInfoCommand.Transaction = transaction;
 
-                _saveInfoCommand.ExecuteNonQuery();
+                        saveInfoCommand.ExecuteNonQuery();
 
-                transaction.Commit();
-            }
-            catch (OperationCanceledException)
-            {
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
+                        transaction.Commit();
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
 
-                throw;
-            }
-            catch (Exception e)
-            {
-                Logger.ErrorException("Failed to save record:", e);
+                        throw;
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.ErrorException("Failed to save record:", e);
 
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
 
-                throw;
-            }
-            finally
-            {
-                if (transaction != null)
-                {
-                    transaction.Dispose();
+                        throw;
+                    }
+                    finally
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Dispose();
+                        }
+                    }
                 }
-
-                WriteLock.Release();
             }
         }
 
@@ -151,101 +139,104 @@ namespace MediaBrowser.Server.Implementations.Security
                 throw new ArgumentNullException("query");
             }
 
-            using (var cmd = _connection.CreateCommand())
+            using (var connection = CreateConnection(true).Result)
             {
-                cmd.CommandText = BaseSelectText;
-
-                var whereClauses = new List<string>();
-
-                var startIndex = query.StartIndex ?? 0;
-
-                if (!string.IsNullOrWhiteSpace(query.AccessToken))
+                using (var cmd = connection.CreateCommand())
                 {
-                    whereClauses.Add("AccessToken=@AccessToken");
-                    cmd.Parameters.Add(cmd, "@AccessToken", DbType.String).Value = query.AccessToken;
-                }
+                    cmd.CommandText = BaseSelectText;
 
-                if (!string.IsNullOrWhiteSpace(query.UserId))
-                {
-                    whereClauses.Add("UserId=@UserId");
-                    cmd.Parameters.Add(cmd, "@UserId", DbType.String).Value = query.UserId;
-                }
+                    var whereClauses = new List<string>();
 
-                if (!string.IsNullOrWhiteSpace(query.DeviceId))
-                {
-                    whereClauses.Add("DeviceId=@DeviceId");
-                    cmd.Parameters.Add(cmd, "@DeviceId", DbType.String).Value = query.DeviceId;
-                }
+                    var startIndex = query.StartIndex ?? 0;
 
-                if (query.IsActive.HasValue)
-                {
-                    whereClauses.Add("IsActive=@IsActive");
-                    cmd.Parameters.Add(cmd, "@IsActive", DbType.Boolean).Value = query.IsActive.Value;
-                }
+                    if (!string.IsNullOrWhiteSpace(query.AccessToken))
+                    {
+                        whereClauses.Add("AccessToken=@AccessToken");
+                        cmd.Parameters.Add(cmd, "@AccessToken", DbType.String).Value = query.AccessToken;
+                    }
 
-                if (query.HasUser.HasValue)
-                {
-                    if (query.HasUser.Value)
+                    if (!string.IsNullOrWhiteSpace(query.UserId))
                     {
-                        whereClauses.Add("UserId not null");
+                        whereClauses.Add("UserId=@UserId");
+                        cmd.Parameters.Add(cmd, "@UserId", DbType.String).Value = query.UserId;
                     }
-                    else
+
+                    if (!string.IsNullOrWhiteSpace(query.DeviceId))
                     {
-                        whereClauses.Add("UserId is null");
+                        whereClauses.Add("DeviceId=@DeviceId");
+                        cmd.Parameters.Add(cmd, "@DeviceId", DbType.String).Value = query.DeviceId;
                     }
-                }
 
-                var whereTextWithoutPaging = whereClauses.Count == 0 ?
-                    string.Empty :
-                    " where " + string.Join(" AND ", whereClauses.ToArray());
+                    if (query.IsActive.HasValue)
+                    {
+                        whereClauses.Add("IsActive=@IsActive");
+                        cmd.Parameters.Add(cmd, "@IsActive", DbType.Boolean).Value = query.IsActive.Value;
+                    }
 
-                if (startIndex > 0)
-                {
-                    var pagingWhereText = whereClauses.Count == 0 ?
+                    if (query.HasUser.HasValue)
+                    {
+                        if (query.HasUser.Value)
+                        {
+                            whereClauses.Add("UserId not null");
+                        }
+                        else
+                        {
+                            whereClauses.Add("UserId is null");
+                        }
+                    }
+
+                    var whereTextWithoutPaging = whereClauses.Count == 0 ?
                         string.Empty :
                         " where " + string.Join(" AND ", whereClauses.ToArray());
 
-                    whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM AccessTokens {0} ORDER BY DateCreated LIMIT {1})",
-                        pagingWhereText,
-                        startIndex.ToString(_usCulture)));
-                }
+                    if (startIndex > 0)
+                    {
+                        var pagingWhereText = whereClauses.Count == 0 ?
+                            string.Empty :
+                            " where " + string.Join(" AND ", whereClauses.ToArray());
 
-                var whereText = whereClauses.Count == 0 ?
-                    string.Empty :
-                    " where " + string.Join(" AND ", whereClauses.ToArray());
+                        whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM AccessTokens {0} ORDER BY DateCreated LIMIT {1})",
+                            pagingWhereText,
+                            startIndex.ToString(_usCulture)));
+                    }
 
-                cmd.CommandText += whereText;
+                    var whereText = whereClauses.Count == 0 ?
+                        string.Empty :
+                        " where " + string.Join(" AND ", whereClauses.ToArray());
 
-                cmd.CommandText += " ORDER BY DateCreated";
+                    cmd.CommandText += whereText;
 
-                if (query.Limit.HasValue)
-                {
-                    cmd.CommandText += " LIMIT " + query.Limit.Value.ToString(_usCulture);
-                }
+                    cmd.CommandText += " ORDER BY DateCreated";
 
-                cmd.CommandText += "; select count (Id) from AccessTokens" + whereTextWithoutPaging;
+                    if (query.Limit.HasValue)
+                    {
+                        cmd.CommandText += " LIMIT " + query.Limit.Value.ToString(_usCulture);
+                    }
 
-                var list = new List<AuthenticationInfo>();
-                var count = 0;
+                    cmd.CommandText += "; select count (Id) from AccessTokens" + whereTextWithoutPaging;
 
-                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
-                {
-                    while (reader.Read())
+                    var list = new List<AuthenticationInfo>();
+                    var count = 0;
+
+                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
                     {
-                        list.Add(Get(reader));
+                        while (reader.Read())
+                        {
+                            list.Add(Get(reader));
+                        }
+
+                        if (reader.NextResult() && reader.Read())
+                        {
+                            count = reader.GetInt32(0);
+                        }
                     }
 
-                    if (reader.NextResult() && reader.Read())
+                    return new QueryResult<AuthenticationInfo>()
                     {
-                        count = reader.GetInt32(0);
-                    }
+                        Items = list.ToArray(),
+                        TotalRecordCount = count
+                    };
                 }
-
-                return new QueryResult<AuthenticationInfo>()
-                {
-                    Items = list.ToArray(),
-                    TotalRecordCount = count
-                };
             }
         }
 
@@ -256,24 +247,27 @@ namespace MediaBrowser.Server.Implementations.Security
                 throw new ArgumentNullException("id");
             }
 
-            var guid = new Guid(id);
-
-            using (var cmd = _connection.CreateCommand())
+            using (var connection = CreateConnection(true).Result)
             {
-                cmd.CommandText = BaseSelectText + " where Id=@Id";
-
-                cmd.Parameters.Add(cmd, "@Id", DbType.Guid).Value = guid;
+                var guid = new Guid(id);
 
-                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
+                using (var cmd = connection.CreateCommand())
                 {
-                    if (reader.Read())
+                    cmd.CommandText = BaseSelectText + " where Id=@Id";
+
+                    cmd.Parameters.Add(cmd, "@Id", DbType.Guid).Value = guid;
+
+                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
                     {
-                        return Get(reader);
+                        if (reader.Read())
+                        {
+                            return Get(reader);
+                        }
                     }
                 }
-            }
 
-            return null;
+                return null;
+            }
         }
 
         private AuthenticationInfo Get(IDataReader reader)
@@ -319,19 +313,5 @@ namespace MediaBrowser.Server.Implementations.Security
 
             return info;
         }
-
-        protected override void CloseConnection()
-        {
-            if (_connection != null)
-            {
-                if (_connection.IsOpen())
-                {
-                    _connection.Close();
-                }
-
-                _connection.Dispose();
-                _connection = null;
-            }
-        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 77843ef6b..84aab5e1f 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -404,6 +404,10 @@ namespace MediaBrowser.Server.Implementations.Session
         /// <returns>SessionInfo.</returns>
         private async Task<SessionInfo> GetSessionInfo(string appName, string appVersion, string deviceId, string deviceName, string remoteEndPoint, User user)
         {
+            if (string.IsNullOrWhiteSpace(deviceId))
+            {
+                throw new ArgumentNullException("deviceId");
+            }
             var key = GetSessionKey(appName, deviceId);
 
             await _sessionLock.WaitAsync(CancellationToken.None).ConfigureAwait(false);
@@ -928,7 +932,7 @@ namespace MediaBrowser.Server.Implementations.Session
             return session.SessionController.SendGeneralCommand(command, cancellationToken);
         }
 
-        public Task SendPlayCommand(string controllingSessionId, string sessionId, PlayRequest command, CancellationToken cancellationToken)
+        public async Task SendPlayCommand(string controllingSessionId, string sessionId, PlayRequest command, CancellationToken cancellationToken)
         {
             var session = GetSessionToRemoteControl(sessionId);
 
@@ -946,7 +950,14 @@ namespace MediaBrowser.Server.Implementations.Session
             }
             else
             {
-                items = command.ItemIds.SelectMany(i => TranslateItemForPlayback(i, user))
+                var list = new List<BaseItem>();
+                foreach (var itemId in command.ItemIds)
+                {
+                    var subItems = await TranslateItemForPlayback(itemId, user).ConfigureAwait(false);
+                    list.AddRange(subItems);
+                }
+                
+                items = list
                    .Where(i => i.LocationType != LocationType.Virtual)
                    .ToList();
             }
@@ -1009,10 +1020,10 @@ namespace MediaBrowser.Server.Implementations.Session
                 command.ControllingUserId = controllingSession.UserId.Value.ToString("N");
             }
 
-            return session.SessionController.SendPlayCommand(command, cancellationToken);
+            await session.SessionController.SendPlayCommand(command, cancellationToken).ConfigureAwait(false);
         }
 
-        private IEnumerable<BaseItem> TranslateItemForPlayback(string id, User user)
+        private async Task<List<BaseItem>> TranslateItemForPlayback(string id, User user)
         {
             var item = _libraryManager.GetItemById(id);
 
@@ -1033,25 +1044,27 @@ namespace MediaBrowser.Server.Implementations.Session
                 });
 
                 return FilterToSingleMediaType(items)
-                    .OrderBy(i => i.SortName);
+                    .OrderBy(i => i.SortName)
+                    .ToList();
             }
 
             if (item.IsFolder)
             {
                 var folder = (Folder)item;
 
-                var items = folder.GetItems(new InternalItemsQuery(user)
+                var itemsResult = await folder.GetItems(new InternalItemsQuery(user)
                 {
                     Recursive = true,
                     IsFolder = false
 
-                }).Result.Items;
+                }).ConfigureAwait(false);
 
-                return FilterToSingleMediaType(items)
-                    .OrderBy(i => i.SortName);
+                return FilterToSingleMediaType(itemsResult.Items)
+                    .OrderBy(i => i.SortName)
+                    .ToList();
             }
 
-            return new[] { item };
+            return new List<BaseItem> { item };
         }
 
         private IEnumerable<BaseItem> FilterToSingleMediaType(IEnumerable<BaseItem> items)
@@ -1121,11 +1134,11 @@ namespace MediaBrowser.Server.Implementations.Session
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        public Task SendRestartRequiredNotification(CancellationToken cancellationToken)
+        public async Task SendRestartRequiredNotification(CancellationToken cancellationToken)
         {
             var sessions = Sessions.Where(i => i.IsActive && i.SessionController != null).ToList();
 
-            var info = _appHost.GetSystemInfo();
+            var info = await _appHost.GetSystemInfo().ConfigureAwait(false);
 
             var tasks = sessions.Select(session => Task.Run(async () =>
             {
@@ -1140,7 +1153,7 @@ namespace MediaBrowser.Server.Implementations.Session
 
             }, cancellationToken));
 
-            return Task.WhenAll(tasks);
+            await Task.WhenAll(tasks).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -1447,7 +1460,7 @@ namespace MediaBrowser.Server.Implementations.Session
             }
         }
 
-        public async Task RevokeUserTokens(string userId)
+        public async Task RevokeUserTokens(string userId, string currentAccessToken)
         {
             var existing = _authRepo.Get(new AuthenticationInfoQuery
             {
@@ -1457,7 +1470,10 @@ namespace MediaBrowser.Server.Implementations.Session
 
             foreach (var info in existing.Items)
             {
-                await Logout(info.AccessToken).ConfigureAwait(false);
+                if (!string.Equals(currentAccessToken, info.AccessToken, StringComparison.OrdinalIgnoreCase))
+                {
+                    await Logout(info.AccessToken).ConfigureAwait(false);
+                }
             }
         }
 
@@ -1748,6 +1764,11 @@ namespace MediaBrowser.Server.Implementations.Session
 
         public void ReportNowViewingItem(string sessionId, string itemId)
         {
+            if (string.IsNullOrWhiteSpace(itemId))
+            {
+                throw new ArgumentNullException("itemId");
+            }
+
             var item = _libraryManager.GetItemById(new Guid(itemId));
 
             var info = GetItemInfo(item, null, null);
diff --git a/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs b/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
index 602bc4876..ddd7ba53a 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
@@ -230,7 +230,12 @@ namespace MediaBrowser.Server.Implementations.Session
             {
                 var vals = message.Data.Split('|');
 
-                _sessionManager.ReportNowViewingItem(session.Id, vals[1]);
+                var itemId = vals[1];
+
+                if (!string.IsNullOrWhiteSpace(itemId))
+                {
+                    _sessionManager.ReportNowViewingItem(session.Id, itemId);
+                }
             }
         }
 
diff --git a/MediaBrowser.Server.Implementations/Social/SharingManager.cs b/MediaBrowser.Server.Implementations/Social/SharingManager.cs
index 2ffd33ca4..95f0ece0c 100644
--- a/MediaBrowser.Server.Implementations/Social/SharingManager.cs
+++ b/MediaBrowser.Server.Implementations/Social/SharingManager.cs
@@ -43,7 +43,7 @@ namespace MediaBrowser.Server.Implementations.Social
                 throw new ResourceNotFoundException();
             }
 
-            var externalUrl = _appHost.GetSystemInfo().WanAddress;
+            var externalUrl = (await _appHost.GetSystemInfo().ConfigureAwait(false)).WanAddress;
 
             if (string.IsNullOrWhiteSpace(externalUrl))
             {
@@ -58,7 +58,7 @@ namespace MediaBrowser.Server.Implementations.Social
                 UserId = userId
             };
 
-            AddShareInfo(info);
+            AddShareInfo(info, externalUrl);
             
             await _repository.CreateShare(info).ConfigureAwait(false);
 
@@ -74,15 +74,13 @@ namespace MediaBrowser.Server.Implementations.Social
         {
             var info = _repository.GetShareInfo(id);
 
-            AddShareInfo(info);
+            AddShareInfo(info, _appHost.GetSystemInfo().Result.WanAddress);
 
             return info;
         }
 
-        private void AddShareInfo(SocialShareInfo info)
+        private void AddShareInfo(SocialShareInfo info, string externalUrl)
         {
-            var externalUrl = _appHost.GetSystemInfo().WanAddress;
-
             info.ImageUrl = externalUrl + "/Social/Shares/Public/" + info.Id + "/Image";
             info.Url = externalUrl + "/emby/web/shared.html?id=" + info.Id;
 
diff --git a/MediaBrowser.Server.Implementations/Social/SharingRepository.cs b/MediaBrowser.Server.Implementations/Social/SharingRepository.cs
index 317743eb1..c4243c1a7 100644
--- a/MediaBrowser.Server.Implementations/Social/SharingRepository.cs
+++ b/MediaBrowser.Server.Implementations/Social/SharingRepository.cs
@@ -12,54 +12,30 @@ namespace MediaBrowser.Server.Implementations.Social
 {
     public class SharingRepository : BaseSqliteRepository
     {
-        private IDbConnection _connection;
-        private IDbCommand _saveShareCommand;
-        private readonly IApplicationPaths _appPaths;
-
-        public SharingRepository(ILogManager logManager, IApplicationPaths appPaths)
-            : base(logManager)
+        public SharingRepository(ILogManager logManager, IApplicationPaths appPaths, IDbConnector dbConnector)
+            : base(logManager, dbConnector)
         {
-            _appPaths = appPaths;
+            DbFilePath = Path.Combine(appPaths.DataPath, "shares.db");
         }
 
         /// <summary>
         /// Opens the connection to the database
         /// </summary>
         /// <returns>Task.</returns>
-        public async Task Initialize(IDbConnector dbConnector)
+        public async Task Initialize()
         {
-            var dbFile = Path.Combine(_appPaths.DataPath, "shares.db");
-
-            _connection = await dbConnector.Connect(dbFile).ConfigureAwait(false);
-
-            string[] queries = {
+            using (var connection = await CreateConnection().ConfigureAwait(false))
+            {
+                string[] queries = {
 
                                 "create table if not exists Shares (Id GUID, ItemId TEXT, UserId TEXT, ExpirationDate DateTime, PRIMARY KEY (Id))",
                                 "create index if not exists idx_Shares on Shares(Id)",
 
-                                //pragmas
-                                "pragma temp_store = memory",
-
                                 "pragma shrink_memory"
                                };
 
-            _connection.RunQueries(queries, Logger);
-
-            PrepareStatements();
-        }
-
-        /// <summary>
-        /// Prepares the statements.
-        /// </summary>
-        private void PrepareStatements()
-        {
-            _saveShareCommand = _connection.CreateCommand();
-            _saveShareCommand.CommandText = "replace into Shares (Id, ItemId, UserId, ExpirationDate) values (@Id, @ItemId, @UserId, @ExpirationDate)";
-
-            _saveShareCommand.Parameters.Add(_saveShareCommand, "@Id");
-            _saveShareCommand.Parameters.Add(_saveShareCommand, "@ItemId");
-            _saveShareCommand.Parameters.Add(_saveShareCommand, "@UserId");
-            _saveShareCommand.Parameters.Add(_saveShareCommand, "@ExpirationDate");
+                connection.RunQueries(queries, Logger);
+            }
         }
 
         public async Task CreateShare(SocialShareInfo info)
@@ -77,53 +53,62 @@ namespace MediaBrowser.Server.Implementations.Social
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false);
-
-            IDbTransaction transaction = null;
-
-            try
-            {
-                transaction = _connection.BeginTransaction();
-
-                _saveShareCommand.GetParameter(0).Value = new Guid(info.Id);
-                _saveShareCommand.GetParameter(1).Value = info.ItemId;
-                _saveShareCommand.GetParameter(2).Value = info.UserId;
-                _saveShareCommand.GetParameter(3).Value = info.ExpirationDate;
-
-                _saveShareCommand.Transaction = transaction;
-
-                _saveShareCommand.ExecuteNonQuery();
-
-                transaction.Commit();
-            }
-            catch (OperationCanceledException)
-            {
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
-
-                throw;
-            }
-            catch (Exception e)
+            using (var connection = await CreateConnection().ConfigureAwait(false))
             {
-                Logger.ErrorException("Failed to save share:", e);
-
-                if (transaction != null)
+                using (var saveShareCommand = connection.CreateCommand())
                 {
-                    transaction.Rollback();
+                    saveShareCommand.CommandText = "replace into Shares (Id, ItemId, UserId, ExpirationDate) values (@Id, @ItemId, @UserId, @ExpirationDate)";
+
+                    saveShareCommand.Parameters.Add(saveShareCommand, "@Id");
+                    saveShareCommand.Parameters.Add(saveShareCommand, "@ItemId");
+                    saveShareCommand.Parameters.Add(saveShareCommand, "@UserId");
+                    saveShareCommand.Parameters.Add(saveShareCommand, "@ExpirationDate");
+
+                    IDbTransaction transaction = null;
+
+                    try
+                    {
+                        transaction = connection.BeginTransaction();
+
+                        saveShareCommand.GetParameter(0).Value = new Guid(info.Id);
+                        saveShareCommand.GetParameter(1).Value = info.ItemId;
+                        saveShareCommand.GetParameter(2).Value = info.UserId;
+                        saveShareCommand.GetParameter(3).Value = info.ExpirationDate;
+
+                        saveShareCommand.Transaction = transaction;
+
+                        saveShareCommand.ExecuteNonQuery();
+
+                        transaction.Commit();
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
+
+                        throw;
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.ErrorException("Failed to save share:", e);
+
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
+
+                        throw;
+                    }
+                    finally
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Dispose();
+                        }
+                    }
                 }
-
-                throw;
-            }
-            finally
-            {
-                if (transaction != null)
-                {
-                    transaction.Dispose();
-                }
-
-                WriteLock.Release();
             }
         }
 
@@ -134,20 +119,23 @@ namespace MediaBrowser.Server.Implementations.Social
                 throw new ArgumentNullException("id");
             }
 
-            var cmd = _connection.CreateCommand();
-            cmd.CommandText = "select Id, ItemId, UserId, ExpirationDate from Shares where id = @id";
+            using (var connection = CreateConnection(true).Result)
+            {
+                var cmd = connection.CreateCommand();
+                cmd.CommandText = "select Id, ItemId, UserId, ExpirationDate from Shares where id = @id";
 
-            cmd.Parameters.Add(cmd, "@id", DbType.Guid).Value = new Guid(id);
+                cmd.Parameters.Add(cmd, "@id", DbType.Guid).Value = new Guid(id);
 
-            using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
-            {
-                if (reader.Read())
+                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
                 {
-                    return GetSocialShareInfo(reader);
+                    if (reader.Read())
+                    {
+                        return GetSocialShareInfo(reader);
+                    }
                 }
-            }
 
-            return null;
+                return null;
+            }
         }
 
         private SocialShareInfo GetSocialShareInfo(IDataReader reader)
@@ -164,21 +152,7 @@ namespace MediaBrowser.Server.Implementations.Social
 
         public async Task DeleteShare(string id)
         {
-            
-        }
 
-        protected override void CloseConnection()
-        {
-            if (_connection != null)
-            {
-                if (_connection.IsOpen())
-                {
-                    _connection.Close();
-                }
-
-                _connection.Dispose();
-                _connection = null;
-            }
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
index bbba06870..e120d3a4d 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
@@ -234,10 +234,22 @@ namespace MediaBrowser.Server.Implementations.Sync
 
         public async Task<IEnumerable<BaseItem>> GetItemsForSync(SyncCategory? category, string parentId, IEnumerable<string> itemIds, User user, bool unwatchedOnly)
         {
-            var items = category.HasValue ?
-                await GetItemsForSync(category.Value, parentId, user).ConfigureAwait(false) :
-                itemIds.SelectMany(i => GetItemsForSync(i, user));
+            var list = new List<BaseItem>();
 
+            if (category.HasValue)
+            {
+                list = (await GetItemsForSync(category.Value, parentId, user).ConfigureAwait(false)).ToList();
+            }
+            else
+            {
+                foreach (var itemId in itemIds)
+                {
+                    var subList = await GetItemsForSync(itemId, user).ConfigureAwait(false);
+                    list.AddRange(subList);
+                }
+            }
+
+            IEnumerable<BaseItem> items = list;
             items = items.Where(_syncManager.SupportsSync);
 
             if (unwatchedOnly)
@@ -314,7 +326,7 @@ namespace MediaBrowser.Server.Implementations.Sync
             return result.Items;
         }
 
-        private IEnumerable<BaseItem> GetItemsForSync(string id, User user)
+        private async Task<List<BaseItem>> GetItemsForSync(string id, User user)
         {
             var item = _libraryManager.GetItemById(id);
 
@@ -330,18 +342,20 @@ namespace MediaBrowser.Server.Implementations.Sync
                 {
                     IsFolder = false,
                     Recursive = true
-                });
+                }).ToList();
             }
 
             if (item.IsFolder)
             {
                 var folder = (Folder)item;
-                var items = folder.GetItems(new InternalItemsQuery(user)
+                var itemsResult = await folder.GetItems(new InternalItemsQuery(user)
                 {
                     Recursive = true,
                     IsFolder = false
 
-                }).Result.Items;
+                }).ConfigureAwait(false);
+
+                var items = itemsResult.Items;
 
                 if (!folder.IsPreSorted)
                 {
@@ -349,10 +363,10 @@ namespace MediaBrowser.Server.Implementations.Sync
                         .ToArray();
                 }
 
-                return items;
+                return items.ToList();
             }
 
-            return new[] { item };
+            return new List<BaseItem> { item };
         }
 
         private async Task EnsureSyncJobItems(string targetId, CancellationToken cancellationToken)
@@ -483,6 +497,11 @@ namespace MediaBrowser.Server.Implementations.Sync
 
         private async Task ProcessJobItem(SyncJobItem jobItem, bool enableConversion, IProgress<double> progress, CancellationToken cancellationToken)
         {
+            if (jobItem == null)
+            {
+                throw new ArgumentNullException("jobItem");
+            }
+
             var item = _libraryManager.GetItemById(jobItem.ItemId);
             if (item == null)
             {
@@ -748,7 +767,7 @@ namespace MediaBrowser.Server.Implementations.Sync
 
             _fileSystem.CreateDirectory(Path.GetDirectoryName(path));
 
-            using (var stream = await _subtitleEncoder.GetSubtitles(streamInfo.ItemId, streamInfo.MediaSourceId, subtitleStreamIndex, subtitleStreamInfo.Format, 0, null, cancellationToken).ConfigureAwait(false))
+            using (var stream = await _subtitleEncoder.GetSubtitles(streamInfo.ItemId, streamInfo.MediaSourceId, subtitleStreamIndex, subtitleStreamInfo.Format, 0, null, false, cancellationToken).ConfigureAwait(false))
             {
                 using (var fs = _fileSystem.GetFileStream(path, FileMode.Create, FileAccess.Write, FileShare.Read, true))
                 {
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs b/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs
index 739d1ab6e..a1ed66a99 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs
@@ -18,34 +18,22 @@ namespace MediaBrowser.Server.Implementations.Sync
 {
     public class SyncRepository : BaseSqliteRepository, ISyncRepository
     {
-        private IDbConnection _connection;
         private readonly CultureInfo _usCulture = new CultureInfo("en-US");
 
-        private IDbCommand _insertJobCommand;
-        private IDbCommand _updateJobCommand;
-        private IDbCommand _deleteJobCommand;
-
-        private IDbCommand _deleteJobItemsCommand;
-        private IDbCommand _insertJobItemCommand;
-        private IDbCommand _updateJobItemCommand;
-
         private readonly IJsonSerializer _json;
-        private readonly IServerApplicationPaths _appPaths;
 
-        public SyncRepository(ILogManager logManager, IJsonSerializer json, IServerApplicationPaths appPaths)
-            : base(logManager)
+        public SyncRepository(ILogManager logManager, IJsonSerializer json, IServerApplicationPaths appPaths, IDbConnector connector)
+            : base(logManager, connector)
         {
             _json = json;
-            _appPaths = appPaths;
+            DbFilePath = Path.Combine(appPaths.DataPath, "sync14.db");
         }
 
-        public async Task Initialize(IDbConnector dbConnector)
+        public async Task Initialize()
         {
-            var dbFile = Path.Combine(_appPaths.DataPath, "sync14.db");
-
-            _connection = await dbConnector.Connect(dbFile).ConfigureAwait(false);
-
-            string[] queries = {
+            using (var connection = await CreateConnection().ConfigureAwait(false))
+            {
+                string[] queries = {
 
                                 "create table if not exists SyncJobs (Id GUID PRIMARY KEY, TargetId TEXT NOT NULL, Name TEXT NOT NULL, Profile TEXT, Quality TEXT, Bitrate INT, Status TEXT NOT NULL, Progress FLOAT, UserId TEXT NOT NULL, ItemIds TEXT NOT NULL, Category TEXT, ParentId TEXT, UnwatchedOnly BIT, ItemLimit INT, SyncNewContent BIT, DateCreated DateTime, DateLastModified DateTime, ItemCount int)",
                                 "create index if not exists idx_SyncJobs on SyncJobs(Id)",
@@ -55,120 +43,15 @@ namespace MediaBrowser.Server.Implementations.Sync
                                 "create index if not exists idx_SyncJobItems1 on SyncJobItems(Id)",
                                 "create index if not exists idx_SyncJobItems2 on SyncJobItems(TargetId)",
 
-                                //pragmas
-                                "pragma temp_store = memory",
-
                                 "pragma shrink_memory"
                                };
 
-            _connection.RunQueries(queries, Logger);
+                connection.RunQueries(queries, Logger);
 
-            _connection.AddColumn(Logger, "SyncJobs", "Profile", "TEXT");
-            _connection.AddColumn(Logger, "SyncJobs", "Bitrate", "INT");
-            _connection.AddColumn(Logger, "SyncJobItems", "ItemDateModifiedTicks", "BIGINT");
-
-            PrepareStatements();
-        }
-
-        private void PrepareStatements()
-        {
-            // _deleteJobCommand
-            _deleteJobCommand = _connection.CreateCommand();
-            _deleteJobCommand.CommandText = "delete from SyncJobs where Id=@Id";
-            _deleteJobCommand.Parameters.Add(_deleteJobCommand, "@Id");
-
-            // _deleteJobItemsCommand
-            _deleteJobItemsCommand = _connection.CreateCommand();
-            _deleteJobItemsCommand.CommandText = "delete from SyncJobItems where JobId=@JobId";
-            _deleteJobItemsCommand.Parameters.Add(_deleteJobItemsCommand, "@JobId");
-
-            // _insertJobCommand
-            _insertJobCommand = _connection.CreateCommand();
-            _insertJobCommand.CommandText = "insert into SyncJobs (Id, TargetId, Name, Profile, Quality, Bitrate, Status, Progress, UserId, ItemIds, Category, ParentId, UnwatchedOnly, ItemLimit, SyncNewContent, DateCreated, DateLastModified, ItemCount) values (@Id, @TargetId, @Name, @Profile, @Quality, @Bitrate, @Status, @Progress, @UserId, @ItemIds, @Category, @ParentId, @UnwatchedOnly, @ItemLimit, @SyncNewContent, @DateCreated, @DateLastModified, @ItemCount)";
-
-            _insertJobCommand.Parameters.Add(_insertJobCommand, "@Id");
-            _insertJobCommand.Parameters.Add(_insertJobCommand, "@TargetId");
-            _insertJobCommand.Parameters.Add(_insertJobCommand, "@Name");
-            _insertJobCommand.Parameters.Add(_insertJobCommand, "@Profile");
-            _insertJobCommand.Parameters.Add(_insertJobCommand, "@Quality");
-            _insertJobCommand.Parameters.Add(_insertJobCommand, "@Bitrate");
-            _insertJobCommand.Parameters.Add(_insertJobCommand, "@Status");
-            _insertJobCommand.Parameters.Add(_insertJobCommand, "@Progress");
-            _insertJobCommand.Parameters.Add(_insertJobCommand, "@UserId");
-            _insertJobCommand.Parameters.Add(_insertJobCommand, "@ItemIds");
-            _insertJobCommand.Parameters.Add(_insertJobCommand, "@Category");
-            _insertJobCommand.Parameters.Add(_insertJobCommand, "@ParentId");
-            _insertJobCommand.Parameters.Add(_insertJobCommand, "@UnwatchedOnly");
-            _insertJobCommand.Parameters.Add(_insertJobCommand, "@ItemLimit");
-            _insertJobCommand.Parameters.Add(_insertJobCommand, "@SyncNewContent");
-            _insertJobCommand.Parameters.Add(_insertJobCommand, "@DateCreated");
-            _insertJobCommand.Parameters.Add(_insertJobCommand, "@DateLastModified");
-            _insertJobCommand.Parameters.Add(_insertJobCommand, "@ItemCount");
-
-            // _updateJobCommand
-            _updateJobCommand = _connection.CreateCommand();
-            _updateJobCommand.CommandText = "update SyncJobs set TargetId=@TargetId,Name=@Name,Profile=@Profile,Quality=@Quality,Bitrate=@Bitrate,Status=@Status,Progress=@Progress,UserId=@UserId,ItemIds=@ItemIds,Category=@Category,ParentId=@ParentId,UnwatchedOnly=@UnwatchedOnly,ItemLimit=@ItemLimit,SyncNewContent=@SyncNewContent,DateCreated=@DateCreated,DateLastModified=@DateLastModified,ItemCount=@ItemCount where Id=@Id";
-
-            _updateJobCommand.Parameters.Add(_updateJobCommand, "@Id");
-            _updateJobCommand.Parameters.Add(_updateJobCommand, "@TargetId");
-            _updateJobCommand.Parameters.Add(_updateJobCommand, "@Name");
-            _updateJobCommand.Parameters.Add(_updateJobCommand, "@Profile");
-            _updateJobCommand.Parameters.Add(_updateJobCommand, "@Quality");
-            _updateJobCommand.Parameters.Add(_updateJobCommand, "@Bitrate");
-            _updateJobCommand.Parameters.Add(_updateJobCommand, "@Status");
-            _updateJobCommand.Parameters.Add(_updateJobCommand, "@Progress");
-            _updateJobCommand.Parameters.Add(_updateJobCommand, "@UserId");
-            _updateJobCommand.Parameters.Add(_updateJobCommand, "@ItemIds");
-            _updateJobCommand.Parameters.Add(_updateJobCommand, "@Category");
-            _updateJobCommand.Parameters.Add(_updateJobCommand, "@ParentId");
-            _updateJobCommand.Parameters.Add(_updateJobCommand, "@UnwatchedOnly");
-            _updateJobCommand.Parameters.Add(_updateJobCommand, "@ItemLimit");
-            _updateJobCommand.Parameters.Add(_updateJobCommand, "@SyncNewContent");
-            _updateJobCommand.Parameters.Add(_updateJobCommand, "@DateCreated");
-            _updateJobCommand.Parameters.Add(_updateJobCommand, "@DateLastModified");
-            _updateJobCommand.Parameters.Add(_updateJobCommand, "@ItemCount");
-
-            // _insertJobItemCommand
-            _insertJobItemCommand = _connection.CreateCommand();
-            _insertJobItemCommand.CommandText = "insert into SyncJobItems (Id, ItemId, ItemName, MediaSourceId, JobId, TemporaryPath, OutputPath, Status, TargetId, DateCreated, Progress, AdditionalFiles, MediaSource, IsMarkedForRemoval, JobItemIndex, ItemDateModifiedTicks) values (@Id, @ItemId, @ItemName, @MediaSourceId, @JobId, @TemporaryPath, @OutputPath, @Status, @TargetId, @DateCreated, @Progress, @AdditionalFiles, @MediaSource, @IsMarkedForRemoval, @JobItemIndex, @ItemDateModifiedTicks)";
-
-            _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@Id");
-            _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@ItemId");
-            _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@ItemName");
-            _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@MediaSourceId");
-            _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@JobId");
-            _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@TemporaryPath");
-            _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@OutputPath");
-            _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@Status");
-            _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@TargetId");
-            _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@DateCreated");
-            _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@Progress");
-            _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@AdditionalFiles");
-            _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@MediaSource");
-            _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@IsMarkedForRemoval");
-            _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@JobItemIndex");
-            _insertJobItemCommand.Parameters.Add(_insertJobItemCommand, "@ItemDateModifiedTicks");
-
-            // _updateJobItemCommand
-            _updateJobItemCommand = _connection.CreateCommand();
-            _updateJobItemCommand.CommandText = "update SyncJobItems set ItemId=@ItemId,ItemName=@ItemName,MediaSourceId=@MediaSourceId,JobId=@JobId,TemporaryPath=@TemporaryPath,OutputPath=@OutputPath,Status=@Status,TargetId=@TargetId,DateCreated=@DateCreated,Progress=@Progress,AdditionalFiles=@AdditionalFiles,MediaSource=@MediaSource,IsMarkedForRemoval=@IsMarkedForRemoval,JobItemIndex=@JobItemIndex,ItemDateModifiedTicks=@ItemDateModifiedTicks where Id=@Id";
-
-            _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@Id");
-            _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@ItemId");
-            _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@ItemName");
-            _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@MediaSourceId");
-            _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@JobId");
-            _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@TemporaryPath");
-            _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@OutputPath");
-            _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@Status");
-            _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@TargetId");
-            _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@DateCreated");
-            _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@Progress");
-            _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@AdditionalFiles");
-            _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@MediaSource");
-            _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@IsMarkedForRemoval");
-            _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@JobItemIndex");
-            _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@ItemDateModifiedTicks");
+                connection.AddColumn(Logger, "SyncJobs", "Profile", "TEXT");
+                connection.AddColumn(Logger, "SyncJobs", "Bitrate", "INT");
+                connection.AddColumn(Logger, "SyncJobItems", "ItemDateModifiedTicks", "BIGINT");
+            }
         }
 
         private const string BaseJobSelectText = "select Id, TargetId, Name, Profile, Quality, Bitrate, Status, Progress, UserId, ItemIds, Category, ParentId, UnwatchedOnly, ItemLimit, SyncNewContent, DateCreated, DateLastModified, ItemCount from SyncJobs";
@@ -182,7 +65,7 @@ namespace MediaBrowser.Server.Implementations.Sync
             }
 
             CheckDisposed();
-            
+
             var guid = new Guid(id);
 
             if (guid == Guid.Empty)
@@ -190,22 +73,25 @@ namespace MediaBrowser.Server.Implementations.Sync
                 throw new ArgumentNullException("id");
             }
 
-            using (var cmd = _connection.CreateCommand())
+            using (var connection = CreateConnection(true).Result)
             {
-                cmd.CommandText = BaseJobSelectText + " where Id=@Id";
+                using (var cmd = connection.CreateCommand())
+                {
+                    cmd.CommandText = BaseJobSelectText + " where Id=@Id";
 
-                cmd.Parameters.Add(cmd, "@Id", DbType.Guid).Value = guid;
+                    cmd.Parameters.Add(cmd, "@Id", DbType.Guid).Value = guid;
 
-                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
-                {
-                    if (reader.Read())
+                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
                     {
-                        return GetJob(reader);
+                        if (reader.Read())
+                        {
+                            return GetJob(reader);
+                        }
                     }
                 }
-            }
 
-            return null;
+                return null;
+            }
         }
 
         private SyncJob GetJob(IDataReader reader)
@@ -283,15 +169,15 @@ namespace MediaBrowser.Server.Implementations.Sync
 
         public Task Create(SyncJob job)
         {
-            return InsertOrUpdate(job, _insertJobCommand);
+            return InsertOrUpdate(job, true);
         }
 
         public Task Update(SyncJob job)
         {
-            return InsertOrUpdate(job, _updateJobCommand);
+            return InsertOrUpdate(job, false);
         }
 
-        private async Task InsertOrUpdate(SyncJob job, IDbCommand cmd)
+        private async Task InsertOrUpdate(SyncJob job, bool insert)
         {
             if (job == null)
             {
@@ -299,70 +185,119 @@ namespace MediaBrowser.Server.Implementations.Sync
             }
 
             CheckDisposed();
-            
-            await WriteLock.WaitAsync().ConfigureAwait(false);
-
-            IDbTransaction transaction = null;
 
-            try
+            using (var connection = await CreateConnection().ConfigureAwait(false))
             {
-                transaction = _connection.BeginTransaction();
-
-                var index = 0;
-
-                cmd.GetParameter(index++).Value = new Guid(job.Id);
-                cmd.GetParameter(index++).Value = job.TargetId;
-                cmd.GetParameter(index++).Value = job.Name;
-                cmd.GetParameter(index++).Value = job.Profile;
-                cmd.GetParameter(index++).Value = job.Quality;
-                cmd.GetParameter(index++).Value = job.Bitrate;
-                cmd.GetParameter(index++).Value = job.Status.ToString();
-                cmd.GetParameter(index++).Value = job.Progress;
-                cmd.GetParameter(index++).Value = job.UserId;
-                cmd.GetParameter(index++).Value = string.Join(",", job.RequestedItemIds.ToArray());
-                cmd.GetParameter(index++).Value = job.Category;
-                cmd.GetParameter(index++).Value = job.ParentId;
-                cmd.GetParameter(index++).Value = job.UnwatchedOnly;
-                cmd.GetParameter(index++).Value = job.ItemLimit;
-                cmd.GetParameter(index++).Value = job.SyncNewContent;
-                cmd.GetParameter(index++).Value = job.DateCreated;
-                cmd.GetParameter(index++).Value = job.DateLastModified;
-                cmd.GetParameter(index++).Value = job.ItemCount;
-
-                cmd.Transaction = transaction;
+                using (var cmd = connection.CreateCommand())
+                {
+                    if (insert)
+                    {
+                        cmd.CommandText = "insert into SyncJobs (Id, TargetId, Name, Profile, Quality, Bitrate, Status, Progress, UserId, ItemIds, Category, ParentId, UnwatchedOnly, ItemLimit, SyncNewContent, DateCreated, DateLastModified, ItemCount) values (@Id, @TargetId, @Name, @Profile, @Quality, @Bitrate, @Status, @Progress, @UserId, @ItemIds, @Category, @ParentId, @UnwatchedOnly, @ItemLimit, @SyncNewContent, @DateCreated, @DateLastModified, @ItemCount)";
+
+                        cmd.Parameters.Add(cmd, "@Id");
+                        cmd.Parameters.Add(cmd, "@TargetId");
+                        cmd.Parameters.Add(cmd, "@Name");
+                        cmd.Parameters.Add(cmd, "@Profile");
+                        cmd.Parameters.Add(cmd, "@Quality");
+                        cmd.Parameters.Add(cmd, "@Bitrate");
+                        cmd.Parameters.Add(cmd, "@Status");
+                        cmd.Parameters.Add(cmd, "@Progress");
+                        cmd.Parameters.Add(cmd, "@UserId");
+                        cmd.Parameters.Add(cmd, "@ItemIds");
+                        cmd.Parameters.Add(cmd, "@Category");
+                        cmd.Parameters.Add(cmd, "@ParentId");
+                        cmd.Parameters.Add(cmd, "@UnwatchedOnly");
+                        cmd.Parameters.Add(cmd, "@ItemLimit");
+                        cmd.Parameters.Add(cmd, "@SyncNewContent");
+                        cmd.Parameters.Add(cmd, "@DateCreated");
+                        cmd.Parameters.Add(cmd, "@DateLastModified");
+                        cmd.Parameters.Add(cmd, "@ItemCount");
+                    }
+                    else
+                    {
+                        cmd.CommandText = "update SyncJobs set TargetId=@TargetId,Name=@Name,Profile=@Profile,Quality=@Quality,Bitrate=@Bitrate,Status=@Status,Progress=@Progress,UserId=@UserId,ItemIds=@ItemIds,Category=@Category,ParentId=@ParentId,UnwatchedOnly=@UnwatchedOnly,ItemLimit=@ItemLimit,SyncNewContent=@SyncNewContent,DateCreated=@DateCreated,DateLastModified=@DateLastModified,ItemCount=@ItemCount where Id=@Id";
+
+                        cmd.Parameters.Add(cmd, "@Id");
+                        cmd.Parameters.Add(cmd, "@TargetId");
+                        cmd.Parameters.Add(cmd, "@Name");
+                        cmd.Parameters.Add(cmd, "@Profile");
+                        cmd.Parameters.Add(cmd, "@Quality");
+                        cmd.Parameters.Add(cmd, "@Bitrate");
+                        cmd.Parameters.Add(cmd, "@Status");
+                        cmd.Parameters.Add(cmd, "@Progress");
+                        cmd.Parameters.Add(cmd, "@UserId");
+                        cmd.Parameters.Add(cmd, "@ItemIds");
+                        cmd.Parameters.Add(cmd, "@Category");
+                        cmd.Parameters.Add(cmd, "@ParentId");
+                        cmd.Parameters.Add(cmd, "@UnwatchedOnly");
+                        cmd.Parameters.Add(cmd, "@ItemLimit");
+                        cmd.Parameters.Add(cmd, "@SyncNewContent");
+                        cmd.Parameters.Add(cmd, "@DateCreated");
+                        cmd.Parameters.Add(cmd, "@DateLastModified");
+                        cmd.Parameters.Add(cmd, "@ItemCount");
+                    }
 
-                cmd.ExecuteNonQuery();
+                    IDbTransaction transaction = null;
 
-                transaction.Commit();
-            }
-            catch (OperationCanceledException)
-            {
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
+                    try
+                    {
+                        transaction = connection.BeginTransaction();
+
+                        var index = 0;
+
+                        cmd.GetParameter(index++).Value = new Guid(job.Id);
+                        cmd.GetParameter(index++).Value = job.TargetId;
+                        cmd.GetParameter(index++).Value = job.Name;
+                        cmd.GetParameter(index++).Value = job.Profile;
+                        cmd.GetParameter(index++).Value = job.Quality;
+                        cmd.GetParameter(index++).Value = job.Bitrate;
+                        cmd.GetParameter(index++).Value = job.Status.ToString();
+                        cmd.GetParameter(index++).Value = job.Progress;
+                        cmd.GetParameter(index++).Value = job.UserId;
+                        cmd.GetParameter(index++).Value = string.Join(",", job.RequestedItemIds.ToArray());
+                        cmd.GetParameter(index++).Value = job.Category;
+                        cmd.GetParameter(index++).Value = job.ParentId;
+                        cmd.GetParameter(index++).Value = job.UnwatchedOnly;
+                        cmd.GetParameter(index++).Value = job.ItemLimit;
+                        cmd.GetParameter(index++).Value = job.SyncNewContent;
+                        cmd.GetParameter(index++).Value = job.DateCreated;
+                        cmd.GetParameter(index++).Value = job.DateLastModified;
+                        cmd.GetParameter(index++).Value = job.ItemCount;
+
+                        cmd.Transaction = transaction;
+
+                        cmd.ExecuteNonQuery();
+
+                        transaction.Commit();
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
 
-                throw;
-            }
-            catch (Exception e)
-            {
-                Logger.ErrorException("Failed to save record:", e);
+                        throw;
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.ErrorException("Failed to save record:", e);
 
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
 
-                throw;
-            }
-            finally
-            {
-                if (transaction != null)
-                {
-                    transaction.Dispose();
+                        throw;
+                    }
+                    finally
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Dispose();
+                        }
+                    }
                 }
-
-                WriteLock.Release();
             }
         }
 
@@ -374,56 +309,66 @@ namespace MediaBrowser.Server.Implementations.Sync
             }
 
             CheckDisposed();
-            
-            await WriteLock.WaitAsync().ConfigureAwait(false);
-
-            IDbTransaction transaction = null;
-
-            try
-            {
-                transaction = _connection.BeginTransaction();
-
-                var index = 0;
-
-                _deleteJobCommand.GetParameter(index++).Value = new Guid(id);
-                _deleteJobCommand.Transaction = transaction;
-                _deleteJobCommand.ExecuteNonQuery();
-
-                index = 0;
-                _deleteJobItemsCommand.GetParameter(index++).Value = id;
-                _deleteJobItemsCommand.Transaction = transaction;
-                _deleteJobItemsCommand.ExecuteNonQuery();
-
-                transaction.Commit();
-            }
-            catch (OperationCanceledException)
-            {
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
 
-                throw;
-            }
-            catch (Exception e)
+            using (var connection = await CreateConnection().ConfigureAwait(false))
             {
-                Logger.ErrorException("Failed to save record:", e);
-
-                if (transaction != null)
+                using (var deleteJobCommand = connection.CreateCommand())
                 {
-                    transaction.Rollback();
-                }
-
-                throw;
-            }
-            finally
-            {
-                if (transaction != null)
-                {
-                    transaction.Dispose();
+                    using (var deleteJobItemsCommand = connection.CreateCommand())
+                    {
+                        IDbTransaction transaction = null;
+
+                        try
+                        {
+                            // _deleteJobCommand
+                            deleteJobCommand.CommandText = "delete from SyncJobs where Id=@Id";
+                            deleteJobCommand.Parameters.Add(deleteJobCommand, "@Id");
+
+                            transaction = connection.BeginTransaction();
+
+                            deleteJobCommand.GetParameter(0).Value = new Guid(id);
+                            deleteJobCommand.Transaction = transaction;
+                            deleteJobCommand.ExecuteNonQuery();
+
+                            // _deleteJobItemsCommand
+                            deleteJobItemsCommand.CommandText = "delete from SyncJobItems where JobId=@JobId";
+                            deleteJobItemsCommand.Parameters.Add(deleteJobItemsCommand, "@JobId");
+
+                            deleteJobItemsCommand.GetParameter(0).Value = id;
+                            deleteJobItemsCommand.Transaction = transaction;
+                            deleteJobItemsCommand.ExecuteNonQuery();
+
+                            transaction.Commit();
+                        }
+                        catch (OperationCanceledException)
+                        {
+                            if (transaction != null)
+                            {
+                                transaction.Rollback();
+                            }
+
+                            throw;
+                        }
+                        catch (Exception e)
+                        {
+                            Logger.ErrorException("Failed to save record:", e);
+
+                            if (transaction != null)
+                            {
+                                transaction.Rollback();
+                            }
+
+                            throw;
+                        }
+                        finally
+                        {
+                            if (transaction != null)
+                            {
+                                transaction.Dispose();
+                            }
+                        }
+                    }
                 }
-
-                WriteLock.Release();
             }
         }
 
@@ -435,83 +380,86 @@ namespace MediaBrowser.Server.Implementations.Sync
             }
 
             CheckDisposed();
-            
-            using (var cmd = _connection.CreateCommand())
+
+            using (var connection = CreateConnection(true).Result)
             {
-                cmd.CommandText = BaseJobSelectText;
+                using (var cmd = connection.CreateCommand())
+                {
+                    cmd.CommandText = BaseJobSelectText;
 
-                var whereClauses = new List<string>();
+                    var whereClauses = new List<string>();
 
-                if (query.Statuses.Length > 0)
-                {
-                    var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray());
+                    if (query.Statuses.Length > 0)
+                    {
+                        var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray());
 
-                    whereClauses.Add(string.Format("Status in ({0})", statuses));
-                }
-                if (!string.IsNullOrWhiteSpace(query.TargetId))
-                {
-                    whereClauses.Add("TargetId=@TargetId");
-                    cmd.Parameters.Add(cmd, "@TargetId", DbType.String).Value = query.TargetId;
-                }
-                if (!string.IsNullOrWhiteSpace(query.UserId))
-                {
-                    whereClauses.Add("UserId=@UserId");
-                    cmd.Parameters.Add(cmd, "@UserId", DbType.String).Value = query.UserId;
-                }
-                if (query.SyncNewContent.HasValue)
-                {
-                    whereClauses.Add("SyncNewContent=@SyncNewContent");
-                    cmd.Parameters.Add(cmd, "@SyncNewContent", DbType.Boolean).Value = query.SyncNewContent.Value;
-                }
+                        whereClauses.Add(string.Format("Status in ({0})", statuses));
+                    }
+                    if (!string.IsNullOrWhiteSpace(query.TargetId))
+                    {
+                        whereClauses.Add("TargetId=@TargetId");
+                        cmd.Parameters.Add(cmd, "@TargetId", DbType.String).Value = query.TargetId;
+                    }
+                    if (!string.IsNullOrWhiteSpace(query.UserId))
+                    {
+                        whereClauses.Add("UserId=@UserId");
+                        cmd.Parameters.Add(cmd, "@UserId", DbType.String).Value = query.UserId;
+                    }
+                    if (query.SyncNewContent.HasValue)
+                    {
+                        whereClauses.Add("SyncNewContent=@SyncNewContent");
+                        cmd.Parameters.Add(cmd, "@SyncNewContent", DbType.Boolean).Value = query.SyncNewContent.Value;
+                    }
 
-                cmd.CommandText += " mainTable";
+                    cmd.CommandText += " mainTable";
 
-                var whereTextWithoutPaging = whereClauses.Count == 0 ?
-                    string.Empty :
-                    " where " + string.Join(" AND ", whereClauses.ToArray());
+                    var whereTextWithoutPaging = whereClauses.Count == 0 ?
+                        string.Empty :
+                        " where " + string.Join(" AND ", whereClauses.ToArray());
 
-                var startIndex = query.StartIndex ?? 0;
-                if (startIndex > 0)
-                {
-                    whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM SyncJobs ORDER BY (Select Max(DateLastModified) from SyncJobs where TargetId=mainTable.TargetId) DESC, DateLastModified DESC LIMIT {0})",
-                        startIndex.ToString(_usCulture)));
-                }
+                    var startIndex = query.StartIndex ?? 0;
+                    if (startIndex > 0)
+                    {
+                        whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM SyncJobs ORDER BY (Select Max(DateLastModified) from SyncJobs where TargetId=mainTable.TargetId) DESC, DateLastModified DESC LIMIT {0})",
+                            startIndex.ToString(_usCulture)));
+                    }
 
-                if (whereClauses.Count > 0)
-                {
-                    cmd.CommandText += " where " + string.Join(" AND ", whereClauses.ToArray());
-                }
+                    if (whereClauses.Count > 0)
+                    {
+                        cmd.CommandText += " where " + string.Join(" AND ", whereClauses.ToArray());
+                    }
 
-                cmd.CommandText += " ORDER BY (Select Max(DateLastModified) from SyncJobs where TargetId=mainTable.TargetId) DESC, DateLastModified DESC";
+                    cmd.CommandText += " ORDER BY (Select Max(DateLastModified) from SyncJobs where TargetId=mainTable.TargetId) DESC, DateLastModified DESC";
 
-                if (query.Limit.HasValue)
-                {
-                    cmd.CommandText += " LIMIT " + query.Limit.Value.ToString(_usCulture);
-                }
+                    if (query.Limit.HasValue)
+                    {
+                        cmd.CommandText += " LIMIT " + query.Limit.Value.ToString(_usCulture);
+                    }
 
-                cmd.CommandText += "; select count (Id) from SyncJobs" + whereTextWithoutPaging;
+                    cmd.CommandText += "; select count (Id) from SyncJobs" + whereTextWithoutPaging;
 
-                var list = new List<SyncJob>();
-                var count = 0;
+                    var list = new List<SyncJob>();
+                    var count = 0;
 
-                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
-                {
-                    while (reader.Read())
+                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
                     {
-                        list.Add(GetJob(reader));
+                        while (reader.Read())
+                        {
+                            list.Add(GetJob(reader));
+                        }
+
+                        if (reader.NextResult() && reader.Read())
+                        {
+                            count = reader.GetInt32(0);
+                        }
                     }
 
-                    if (reader.NextResult() && reader.Read())
+                    return new QueryResult<SyncJob>()
                     {
-                        count = reader.GetInt32(0);
-                    }
+                        Items = list.ToArray(),
+                        TotalRecordCount = count
+                    };
                 }
-
-                return new QueryResult<SyncJob>()
-                {
-                    Items = list.ToArray(),
-                    TotalRecordCount = count
-                };
             }
         }
 
@@ -523,25 +471,28 @@ namespace MediaBrowser.Server.Implementations.Sync
             }
 
             CheckDisposed();
-            
+
             var guid = new Guid(id);
 
-            using (var cmd = _connection.CreateCommand())
+            using (var connection = CreateConnection(true).Result)
             {
-                cmd.CommandText = BaseJobItemSelectText + " where Id=@Id";
+                using (var cmd = connection.CreateCommand())
+                {
+                    cmd.CommandText = BaseJobItemSelectText + " where Id=@Id";
 
-                cmd.Parameters.Add(cmd, "@Id", DbType.Guid).Value = guid;
+                    cmd.Parameters.Add(cmd, "@Id", DbType.Guid).Value = guid;
 
-                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
-                {
-                    if (reader.Read())
+                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
                     {
-                        return GetJobItem(reader);
+                        if (reader.Read())
+                        {
+                            return GetJobItem(reader);
+                        }
                     }
                 }
-            }
 
-            return null;
+                return null;
+            }
         }
 
         private QueryResult<T> GetJobItemReader<T>(SyncJobItemQuery query, string baseSelectText, Func<IDataReader, T> itemFactory)
@@ -551,81 +502,84 @@ namespace MediaBrowser.Server.Implementations.Sync
                 throw new ArgumentNullException("query");
             }
 
-            using (var cmd = _connection.CreateCommand())
+            using (var connection = CreateConnection(true).Result)
             {
-                cmd.CommandText = baseSelectText;
+                using (var cmd = connection.CreateCommand())
+                {
+                    cmd.CommandText = baseSelectText;
 
-                var whereClauses = new List<string>();
+                    var whereClauses = new List<string>();
 
-                if (!string.IsNullOrWhiteSpace(query.JobId))
-                {
-                    whereClauses.Add("JobId=@JobId");
-                    cmd.Parameters.Add(cmd, "@JobId", DbType.String).Value = query.JobId;
-                }
-                if (!string.IsNullOrWhiteSpace(query.ItemId))
-                {
-                    whereClauses.Add("ItemId=@ItemId");
-                    cmd.Parameters.Add(cmd, "@ItemId", DbType.String).Value = query.ItemId;
-                }
-                if (!string.IsNullOrWhiteSpace(query.TargetId))
-                {
-                    whereClauses.Add("TargetId=@TargetId");
-                    cmd.Parameters.Add(cmd, "@TargetId", DbType.String).Value = query.TargetId;
-                }
+                    if (!string.IsNullOrWhiteSpace(query.JobId))
+                    {
+                        whereClauses.Add("JobId=@JobId");
+                        cmd.Parameters.Add(cmd, "@JobId", DbType.String).Value = query.JobId;
+                    }
+                    if (!string.IsNullOrWhiteSpace(query.ItemId))
+                    {
+                        whereClauses.Add("ItemId=@ItemId");
+                        cmd.Parameters.Add(cmd, "@ItemId", DbType.String).Value = query.ItemId;
+                    }
+                    if (!string.IsNullOrWhiteSpace(query.TargetId))
+                    {
+                        whereClauses.Add("TargetId=@TargetId");
+                        cmd.Parameters.Add(cmd, "@TargetId", DbType.String).Value = query.TargetId;
+                    }
 
-                if (query.Statuses.Length > 0)
-                {
-                    var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray());
+                    if (query.Statuses.Length > 0)
+                    {
+                        var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray());
 
-                    whereClauses.Add(string.Format("Status in ({0})", statuses));
-                }
+                        whereClauses.Add(string.Format("Status in ({0})", statuses));
+                    }
 
-                var whereTextWithoutPaging = whereClauses.Count == 0 ?
-                    string.Empty :
-                    " where " + string.Join(" AND ", whereClauses.ToArray());
+                    var whereTextWithoutPaging = whereClauses.Count == 0 ?
+                        string.Empty :
+                        " where " + string.Join(" AND ", whereClauses.ToArray());
 
-                var startIndex = query.StartIndex ?? 0;
-                if (startIndex > 0)
-                {
-                    whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM SyncJobItems ORDER BY JobItemIndex, DateCreated LIMIT {0})",
-                        startIndex.ToString(_usCulture)));
-                }
+                    var startIndex = query.StartIndex ?? 0;
+                    if (startIndex > 0)
+                    {
+                        whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM SyncJobItems ORDER BY JobItemIndex, DateCreated LIMIT {0})",
+                            startIndex.ToString(_usCulture)));
+                    }
 
-                if (whereClauses.Count > 0)
-                {
-                    cmd.CommandText += " where " + string.Join(" AND ", whereClauses.ToArray());
-                }
+                    if (whereClauses.Count > 0)
+                    {
+                        cmd.CommandText += " where " + string.Join(" AND ", whereClauses.ToArray());
+                    }
 
-                cmd.CommandText += " ORDER BY JobItemIndex, DateCreated";
+                    cmd.CommandText += " ORDER BY JobItemIndex, DateCreated";
 
-                if (query.Limit.HasValue)
-                {
-                    cmd.CommandText += " LIMIT " + query.Limit.Value.ToString(_usCulture);
-                }
+                    if (query.Limit.HasValue)
+                    {
+                        cmd.CommandText += " LIMIT " + query.Limit.Value.ToString(_usCulture);
+                    }
 
-                cmd.CommandText += "; select count (Id) from SyncJobItems" + whereTextWithoutPaging;
+                    cmd.CommandText += "; select count (Id) from SyncJobItems" + whereTextWithoutPaging;
 
-                var list = new List<T>();
-                var count = 0;
+                    var list = new List<T>();
+                    var count = 0;
 
-                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
-                {
-                    while (reader.Read())
+                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
                     {
-                        list.Add(itemFactory(reader));
+                        while (reader.Read())
+                        {
+                            list.Add(itemFactory(reader));
+                        }
+
+                        if (reader.NextResult() && reader.Read())
+                        {
+                            count = reader.GetInt32(0);
+                        }
                     }
 
-                    if (reader.NextResult() && reader.Read())
+                    return new QueryResult<T>()
                     {
-                        count = reader.GetInt32(0);
-                    }
+                        Items = list.ToArray(),
+                        TotalRecordCount = count
+                    };
                 }
-
-                return new QueryResult<T>()
-                {
-                    Items = list.ToArray(),
-                    TotalRecordCount = count
-                };
             }
         }
 
@@ -641,15 +595,15 @@ namespace MediaBrowser.Server.Implementations.Sync
 
         public Task Create(SyncJobItem jobItem)
         {
-            return InsertOrUpdate(jobItem, _insertJobItemCommand);
+            return InsertOrUpdate(jobItem, true);
         }
 
         public Task Update(SyncJobItem jobItem)
         {
-            return InsertOrUpdate(jobItem, _updateJobItemCommand);
+            return InsertOrUpdate(jobItem, false);
         }
 
-        private async Task InsertOrUpdate(SyncJobItem jobItem, IDbCommand cmd)
+        private async Task InsertOrUpdate(SyncJobItem jobItem, bool insert)
         {
             if (jobItem == null)
             {
@@ -657,68 +611,114 @@ namespace MediaBrowser.Server.Implementations.Sync
             }
 
             CheckDisposed();
-            
-            await WriteLock.WaitAsync().ConfigureAwait(false);
 
-            IDbTransaction transaction = null;
-
-            try
+            using (var connection = await CreateConnection().ConfigureAwait(false))
             {
-                transaction = _connection.BeginTransaction();
-
-                var index = 0;
-
-                cmd.GetParameter(index++).Value = new Guid(jobItem.Id);
-                cmd.GetParameter(index++).Value = jobItem.ItemId;
-                cmd.GetParameter(index++).Value = jobItem.ItemName;
-                cmd.GetParameter(index++).Value = jobItem.MediaSourceId;
-                cmd.GetParameter(index++).Value = jobItem.JobId;
-                cmd.GetParameter(index++).Value = jobItem.TemporaryPath;
-                cmd.GetParameter(index++).Value = jobItem.OutputPath;
-                cmd.GetParameter(index++).Value = jobItem.Status.ToString();
-                cmd.GetParameter(index++).Value = jobItem.TargetId;
-                cmd.GetParameter(index++).Value = jobItem.DateCreated;
-                cmd.GetParameter(index++).Value = jobItem.Progress;
-                cmd.GetParameter(index++).Value = _json.SerializeToString(jobItem.AdditionalFiles);
-                cmd.GetParameter(index++).Value = jobItem.MediaSource == null ? null : _json.SerializeToString(jobItem.MediaSource);
-                cmd.GetParameter(index++).Value = jobItem.IsMarkedForRemoval;
-                cmd.GetParameter(index++).Value = jobItem.JobItemIndex;
-                cmd.GetParameter(index++).Value = jobItem.ItemDateModifiedTicks;
-
-                cmd.Transaction = transaction;
+                using (var cmd = connection.CreateCommand())
+                {
+                    if (insert)
+                    {
+                        cmd.CommandText = "insert into SyncJobItems (Id, ItemId, ItemName, MediaSourceId, JobId, TemporaryPath, OutputPath, Status, TargetId, DateCreated, Progress, AdditionalFiles, MediaSource, IsMarkedForRemoval, JobItemIndex, ItemDateModifiedTicks) values (@Id, @ItemId, @ItemName, @MediaSourceId, @JobId, @TemporaryPath, @OutputPath, @Status, @TargetId, @DateCreated, @Progress, @AdditionalFiles, @MediaSource, @IsMarkedForRemoval, @JobItemIndex, @ItemDateModifiedTicks)";
+
+                        cmd.Parameters.Add(cmd, "@Id");
+                        cmd.Parameters.Add(cmd, "@ItemId");
+                        cmd.Parameters.Add(cmd, "@ItemName");
+                        cmd.Parameters.Add(cmd, "@MediaSourceId");
+                        cmd.Parameters.Add(cmd, "@JobId");
+                        cmd.Parameters.Add(cmd, "@TemporaryPath");
+                        cmd.Parameters.Add(cmd, "@OutputPath");
+                        cmd.Parameters.Add(cmd, "@Status");
+                        cmd.Parameters.Add(cmd, "@TargetId");
+                        cmd.Parameters.Add(cmd, "@DateCreated");
+                        cmd.Parameters.Add(cmd, "@Progress");
+                        cmd.Parameters.Add(cmd, "@AdditionalFiles");
+                        cmd.Parameters.Add(cmd, "@MediaSource");
+                        cmd.Parameters.Add(cmd, "@IsMarkedForRemoval");
+                        cmd.Parameters.Add(cmd, "@JobItemIndex");
+                        cmd.Parameters.Add(cmd, "@ItemDateModifiedTicks");
+                    }
+                    else
+                    {
+                        // cmd
+                        cmd.CommandText = "update SyncJobItems set ItemId=@ItemId,ItemName=@ItemName,MediaSourceId=@MediaSourceId,JobId=@JobId,TemporaryPath=@TemporaryPath,OutputPath=@OutputPath,Status=@Status,TargetId=@TargetId,DateCreated=@DateCreated,Progress=@Progress,AdditionalFiles=@AdditionalFiles,MediaSource=@MediaSource,IsMarkedForRemoval=@IsMarkedForRemoval,JobItemIndex=@JobItemIndex,ItemDateModifiedTicks=@ItemDateModifiedTicks where Id=@Id";
+
+                        cmd.Parameters.Add(cmd, "@Id");
+                        cmd.Parameters.Add(cmd, "@ItemId");
+                        cmd.Parameters.Add(cmd, "@ItemName");
+                        cmd.Parameters.Add(cmd, "@MediaSourceId");
+                        cmd.Parameters.Add(cmd, "@JobId");
+                        cmd.Parameters.Add(cmd, "@TemporaryPath");
+                        cmd.Parameters.Add(cmd, "@OutputPath");
+                        cmd.Parameters.Add(cmd, "@Status");
+                        cmd.Parameters.Add(cmd, "@TargetId");
+                        cmd.Parameters.Add(cmd, "@DateCreated");
+                        cmd.Parameters.Add(cmd, "@Progress");
+                        cmd.Parameters.Add(cmd, "@AdditionalFiles");
+                        cmd.Parameters.Add(cmd, "@MediaSource");
+                        cmd.Parameters.Add(cmd, "@IsMarkedForRemoval");
+                        cmd.Parameters.Add(cmd, "@JobItemIndex");
+                        cmd.Parameters.Add(cmd, "@ItemDateModifiedTicks");
+                    }
 
-                cmd.ExecuteNonQuery();
+                    IDbTransaction transaction = null;
 
-                transaction.Commit();
-            }
-            catch (OperationCanceledException)
-            {
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
+                    try
+                    {
+                        transaction = connection.BeginTransaction();
+
+                        var index = 0;
+
+                        cmd.GetParameter(index++).Value = new Guid(jobItem.Id);
+                        cmd.GetParameter(index++).Value = jobItem.ItemId;
+                        cmd.GetParameter(index++).Value = jobItem.ItemName;
+                        cmd.GetParameter(index++).Value = jobItem.MediaSourceId;
+                        cmd.GetParameter(index++).Value = jobItem.JobId;
+                        cmd.GetParameter(index++).Value = jobItem.TemporaryPath;
+                        cmd.GetParameter(index++).Value = jobItem.OutputPath;
+                        cmd.GetParameter(index++).Value = jobItem.Status.ToString();
+                        cmd.GetParameter(index++).Value = jobItem.TargetId;
+                        cmd.GetParameter(index++).Value = jobItem.DateCreated;
+                        cmd.GetParameter(index++).Value = jobItem.Progress;
+                        cmd.GetParameter(index++).Value = _json.SerializeToString(jobItem.AdditionalFiles);
+                        cmd.GetParameter(index++).Value = jobItem.MediaSource == null ? null : _json.SerializeToString(jobItem.MediaSource);
+                        cmd.GetParameter(index++).Value = jobItem.IsMarkedForRemoval;
+                        cmd.GetParameter(index++).Value = jobItem.JobItemIndex;
+                        cmd.GetParameter(index++).Value = jobItem.ItemDateModifiedTicks;
+
+                        cmd.Transaction = transaction;
+
+                        cmd.ExecuteNonQuery();
+
+                        transaction.Commit();
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
 
-                throw;
-            }
-            catch (Exception e)
-            {
-                Logger.ErrorException("Failed to save record:", e);
+                        throw;
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.ErrorException("Failed to save record:", e);
 
-                if (transaction != null)
-                {
-                    transaction.Rollback();
-                }
+                        if (transaction != null)
+                        {
+                            transaction.Rollback();
+                        }
 
-                throw;
-            }
-            finally
-            {
-                if (transaction != null)
-                {
-                    transaction.Dispose();
+                        throw;
+                    }
+                    finally
+                    {
+                        if (transaction != null)
+                        {
+                            transaction.Dispose();
+                        }
+                    }
                 }
-
-                WriteLock.Release();
             }
         }
 
@@ -809,19 +809,5 @@ namespace MediaBrowser.Server.Implementations.Sync
 
             return item;
         }
-
-        protected override void CloseConnection()
-        {
-            if (_connection != null)
-            {
-                if (_connection.IsOpen())
-                {
-                    _connection.Close();
-                }
-
-                _connection.Dispose();
-                _connection = null;
-            }
-        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs b/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs
index ec91dc1b7..b65c030f0 100644
--- a/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs
+++ b/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs
@@ -32,9 +32,7 @@ namespace MediaBrowser.Server.Implementations.TV
                 throw new ArgumentException("User not found");
             }
 
-            var parentIds = string.IsNullOrEmpty(request.ParentId)
-                ? new string[] { }
-                : new[] { request.ParentId };
+            var parentIdGuid = string.IsNullOrWhiteSpace(request.ParentId) ? (Guid?)null : new Guid(request.ParentId);
 
             string presentationUniqueKey = null;
             int? limit = null;
@@ -54,9 +52,11 @@ namespace MediaBrowser.Server.Implementations.TV
                 IncludeItemTypes = new[] { typeof(Series).Name },
                 SortOrder = SortOrder.Ascending,
                 PresentationUniqueKey = presentationUniqueKey,
-                Limit = limit
+                Limit = limit,
+                ParentId = parentIdGuid,
+                Recursive = true
 
-            }, parentIds).Cast<Series>();
+            }).Cast<Series>();
 
             // Avoid implicitly captured closure
             var episodes = GetNextUpEpisodes(request, user, items);
@@ -107,28 +107,9 @@ namespace MediaBrowser.Server.Implementations.TV
             var currentUser = user;
 
             return series
-                .AsParallel()
                 .Select(i => GetNextUp(i, currentUser))
                 // Include if an episode was found, and either the series is not unwatched or the specific series was requested
                 .Where(i => i.Item1 != null && (!i.Item3 || !string.IsNullOrWhiteSpace(request.SeriesId)))
-                //.OrderByDescending(i =>
-                //{
-                //    var episode = i.Item1;
-
-                //    var seriesUserData = _userDataManager.GetUserData(user, episode.Series);
-
-                //    if (seriesUserData.IsFavorite)
-                //    {
-                //        return 2;
-                //    }
-
-                //    if (seriesUserData.Likes.HasValue)
-                //    {
-                //        return seriesUserData.Likes.Value ? 1 : -1;
-                //    }
-
-                //    return 0;
-                //})
                 .OrderByDescending(i => i.Item2)
                 .ThenByDescending(i => i.Item1.PremiereDate ?? DateTime.MinValue)
                 .Select(i => i.Item1);
@@ -142,52 +123,45 @@ namespace MediaBrowser.Server.Implementations.TV
         /// <returns>Task{Episode}.</returns>
         private Tuple<Episode, DateTime, bool> GetNextUp(Series series, User user)
         {
-            // Get them in display order, then reverse
-            var allEpisodes = series.GetSeasons(user, true, true)
-                .Where(i => !i.IndexNumber.HasValue || i.IndexNumber.Value != 0)
-                .SelectMany(i => i.GetEpisodes(user))
-                .Reverse()
-                .ToList();
-
-            Episode lastWatched = null;
-            var lastWatchedDate = DateTime.MinValue;
-            Episode nextUp = null;
+            var lastWatchedEpisode = _libraryManager.GetItemList(new InternalItemsQuery(user)
+            {
+                AncestorWithPresentationUniqueKey = series.PresentationUniqueKey,
+                IncludeItemTypes = new[] { typeof(Episode).Name },
+                SortBy = new[] { ItemSortBy.SortName },
+                SortOrder = SortOrder.Descending,
+                IsPlayed = true,
+                Limit = 1,
+                IsVirtualItem = false,
+                ParentIndexNumberNotEquals = 0
+
+            }).FirstOrDefault();
+
+            var firstUnwatchedEpisode = _libraryManager.GetItemList(new InternalItemsQuery(user)
+            {
+                AncestorWithPresentationUniqueKey = series.PresentationUniqueKey,
+                IncludeItemTypes = new[] { typeof(Episode).Name },
+                SortBy = new[] { ItemSortBy.SortName },
+                SortOrder = SortOrder.Ascending,
+                Limit = 1,
+                IsPlayed = false,
+                IsVirtualItem = false,
+                ParentIndexNumberNotEquals = 0,
+                MinSortName = lastWatchedEpisode == null ? null : lastWatchedEpisode.SortName
 
-            var includeMissing = user.Configuration.DisplayMissingEpisodes;
+            }).Cast<Episode>().FirstOrDefault();
 
-            // Go back starting with the most recent episodes
-            foreach (var episode in allEpisodes)
+            if (lastWatchedEpisode != null)
             {
-                var userData = _userDataManager.GetUserData(user, episode);
-
-                if (userData.Played)
-                {
-                    if (lastWatched != null || nextUp == null)
-                    {
-                        break;
-                    }
+                var userData = _userDataManager.GetUserData(user, lastWatchedEpisode);
 
-                    lastWatched = episode;
-                    lastWatchedDate = userData.LastPlayedDate ?? DateTime.MinValue;
-                }
-                else
+                if (userData.LastPlayedDate.HasValue)
                 {
-                    if (!episode.IsVirtualUnaired && (includeMissing || !episode.IsMissingEpisode))
-                    {
-                        nextUp = episode;
-                    }
+                    return new Tuple<Episode, DateTime, bool>(firstUnwatchedEpisode, userData.LastPlayedDate.Value, false);
                 }
             }
 
-            if (lastWatched != null)
-            {
-                return new Tuple<Episode, DateTime, bool>(nextUp, lastWatchedDate, false);
-            }
-
-            var firstEpisode = allEpisodes.LastOrDefault(i => !i.IsVirtualUnaired && (includeMissing || !i.IsMissingEpisode) && !i.IsPlayed(user));
-
             // Return the first episode
-            return new Tuple<Episode, DateTime, bool>(firstEpisode, DateTime.MinValue, true);
+            return new Tuple<Episode, DateTime, bool>(firstUnwatchedEpisode, DateTime.MinValue, true);
         }
 
         private QueryResult<BaseItem> GetResult(IEnumerable<BaseItem> items, int? totalRecordLimit, NextUpQuery query)
diff --git a/MediaBrowser.Server.Implementations/Udp/UdpServer.cs b/MediaBrowser.Server.Implementations/Udp/UdpServer.cs
index 40c4deb19..32992b9b2 100644
--- a/MediaBrowser.Server.Implementations/Udp/UdpServer.cs
+++ b/MediaBrowser.Server.Implementations/Udp/UdpServer.cs
@@ -96,20 +96,20 @@ namespace MediaBrowser.Server.Implementations.Udp
 
         private async void RespondToV1Message(string endpoint, Encoding encoding)
         {
-            var localAddress = _appHost.LocalApiUrl;
+            var localUrl = await _appHost.GetLocalApiUrl().ConfigureAwait(false);
 
-            if (!string.IsNullOrEmpty(localAddress))
+            if (!string.IsNullOrEmpty(localUrl))
             {
                 // This is how we did the old v1 search, so need to strip off the protocol
-                var index = localAddress.IndexOf("://", StringComparison.OrdinalIgnoreCase);
+                var index = localUrl.IndexOf("://", StringComparison.OrdinalIgnoreCase);
 
                 if (index != -1)
                 {
-                    localAddress = localAddress.Substring(index + 3);
+                    localUrl = localUrl.Substring(index + 3);
                 }
 
                 // Send a response back with our ip address and port
-                var response = String.Format("MediaBrowserServer|{0}", localAddress);
+                var response = String.Format("MediaBrowserServer|{0}", localUrl);
 
                 await SendAsync(Encoding.UTF8.GetBytes(response), endpoint);
             }
@@ -121,7 +121,7 @@ namespace MediaBrowser.Server.Implementations.Udp
 
         private async void RespondToV2Message(string endpoint, Encoding encoding)
         {
-            var localUrl = _appHost.LocalApiUrl;
+            var localUrl = await _appHost.GetLocalApiUrl().ConfigureAwait(false);
 
             if (!string.IsNullOrEmpty(localUrl))
             {
diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config
index b877d41a8..9592ecb16 100644
--- a/MediaBrowser.Server.Implementations/packages.config
+++ b/MediaBrowser.Server.Implementations/packages.config
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>

 <packages>

   <package id="CommonIO" version="1.0.0.9" targetFramework="net45" />

-  <package id="Emby.XmlTv" version="1.0.0.48" targetFramework="net45" />

-  <package id="ini-parser" version="2.2.4" targetFramework="net45" />

+  <package id="Emby.XmlTv" version="1.0.0.55" targetFramework="net45" />

+  <package id="ini-parser" version="2.3.0" targetFramework="net45" />

   <package id="Interfaces.IO" version="1.0.0.5" targetFramework="net45" />

-  <package id="MediaBrowser.Naming" version="1.0.0.50" targetFramework="net45" />

+  <package id="MediaBrowser.Naming" version="1.0.0.52" targetFramework="net45" />

   <package id="Mono.Nat" version="1.2.24.0" targetFramework="net45" />

   <package id="morelinq" version="1.4.0" targetFramework="net45" />

   <package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" />

-  <package id="SimpleInjector" version="3.1.4" targetFramework="net45" />

+  <package id="SimpleInjector" version="3.2.0" targetFramework="net45" />

   <package id="SocketHttpListener" version="1.0.0.30" targetFramework="net45" />

 </packages>
\ No newline at end of file