1 files changed, 10 insertions, 9 deletions
diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
index 5ce5fd4fa..9a83dba45 100644
--- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
+++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
@@ -232,9 +232,9 @@ namespace MediaBrowser.Controller.Entities
 
         public int? IndexNumber { get; set; }
 
-        public int? MinParentalRating { get; set; }
+        public ParentalRatingScore? MinParentalRating { get; set; }
 
-        public int? MaxParentalRating { get; set; }
+        public ParentalRatingScore? MaxParentalRating { get; set; }
 
         public bool? HasDeadParentId { get; set; }
 
@@ -360,16 +360,17 @@ namespace MediaBrowser.Controller.Entities
 
         public void SetUser(User user)
         {
-            MaxParentalRating = user.MaxParentalAgeRating;
-
-            if (MaxParentalRating.HasValue)
+            var maxRating = user.MaxParentalRatingScore;
+            if (maxRating.HasValue)
             {
-                string other = UnratedItem.Other.ToString();
-                BlockUnratedItems = user.GetPreference(PreferenceKind.BlockUnratedItems)
-                    .Where(i => i != other)
-                    .Select(e => Enum.Parse<UnratedItem>(e, true)).ToArray();
+                MaxParentalRating = new(maxRating.Value, user.MaxParentalRatingSubScore);
             }
 
+            var other = UnratedItem.Other.ToString();
+            BlockUnratedItems = user.GetPreference(PreferenceKind.BlockUnratedItems)
+                .Where(i => i != other)
+                .Select(e => Enum.Parse<UnratedItem>(e, true)).ToArray();
+
             ExcludeInheritedTags = user.GetPreference(PreferenceKind.BlockedTags);
             IncludeInheritedTags = user.GetPreference(PreferenceKind.AllowedTags);