2 files changed, 17 insertions, 16 deletions
diff --git a/MediaBrowser.Api/ItemUpdateService.cs b/MediaBrowser.Api/ItemUpdateService.cs
index 90cf2d1d1..a55741d7d 100644
--- a/MediaBrowser.Api/ItemUpdateService.cs
+++ b/MediaBrowser.Api/ItemUpdateService.cs
@@ -124,24 +124,24 @@ namespace MediaBrowser.Api
             {
                 list.Add(new NameValuePair
                 {
-                    Name = "FolderTypeInherit",
+                    Name = "Inherit",
                     Value = ""
                 });
             }
 
             list.Add(new NameValuePair
             {
-                Name = "FolderTypeMovies",
+                Name = "Movies",
                 Value = "movies"
             });
             list.Add(new NameValuePair
             {
-                Name = "FolderTypeMusic",
+                Name = "Music",
                 Value = "music"
             });
             list.Add(new NameValuePair
             {
-                Name = "FolderTypeTvShows",
+                Name = "Shows",
                 Value = "tvshows"
             });
 
@@ -149,29 +149,29 @@ namespace MediaBrowser.Api
             {
                 list.Add(new NameValuePair
                 {
-                    Name = "FolderTypeBooks",
+                    Name = "Books",
                     Value = "books"
                 });
                 list.Add(new NameValuePair
                 {
-                    Name = "FolderTypeGames",
+                    Name = "Games",
                     Value = "games"
                 });
             }
 
             list.Add(new NameValuePair
             {
-                Name = "FolderTypeHomeVideos",
+                Name = "HomeVideos",
                 Value = "homevideos"
             });
             list.Add(new NameValuePair
             {
-                Name = "FolderTypeMusicVideos",
+                Name = "MusicVideos",
                 Value = "musicvideos"
             });
             list.Add(new NameValuePair
             {
-                Name = "FolderTypePhotos",
+                Name = "Photos",
                 Value = "photos"
             });
 
@@ -179,7 +179,7 @@ namespace MediaBrowser.Api
             {
                 list.Add(new NameValuePair
                 {
-                    Name = "FolderTypeMixed",
+                    Name = "MixedContent",
                     Value = ""
                 });
             }
diff --git a/MediaBrowser.Api/LiveTv/LiveTvService.cs b/MediaBrowser.Api/LiveTv/LiveTvService.cs
index f46c3e50f..1ae7323dc 100644
--- a/MediaBrowser.Api/LiveTv/LiveTvService.cs
+++ b/MediaBrowser.Api/LiveTv/LiveTvService.cs
@@ -947,9 +947,9 @@ namespace MediaBrowser.Api.LiveTv
 
         public object Get(GetChannel request)
         {
-            var user = string.IsNullOrWhiteSpace(request.UserId) ? null : _userManager.GetUserById(request.UserId);
+            var user = _userManager.GetUserById(request.UserId);
 
-            var item = _libraryManager.GetItemById(request.Id);
+            var item = string.IsNullOrEmpty(request.Id) ? user.RootFolder : _libraryManager.GetItemById(request.Id);
 
             var dtoOptions = GetDtoOptions(_authContext, request);
 
@@ -1098,12 +1098,13 @@ namespace MediaBrowser.Api.LiveTv
 
         public async Task<object> Get(GetRecording request)
         {
-            var user = string.IsNullOrEmpty(request.UserId) ? null : _userManager.GetUserById(request.UserId);
+            var user = _userManager.GetUserById(request.UserId);
 
-            var options = new DtoOptions();
-            options.DeviceId = _authContext.GetAuthorizationInfo(Request).DeviceId;
+            var item = string.IsNullOrEmpty(request.Id) ? user.RootFolder : _libraryManager.GetItemById(request.Id);
 
-            var result = await _liveTvManager.GetRecording(request.Id, options, CancellationToken.None, user).ConfigureAwait(false);
+            var dtoOptions = GetDtoOptions(_authContext, request);
+
+            var result = _dtoService.GetBaseItemDto(item, dtoOptions, user);
 
             return ToOptimizedSerializedResultUsingCache(result);
         }