diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index 6012150513..f89f22bf23 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -204,7 +204,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddAssert("collection filter still selected", () => control.CreateCriteria().Collection?.CollectionName.Value == "1");
+            AddAssert("collection filter still selected", () => control.CreateCriteria().Collection?.Name.Value == "1");
         }
 
         private void assertCollectionHeaderDisplays(string collectionName, bool shouldDisplay = true)
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 8e5655e514..3892e02a8f 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Screens.Select.Carousel
             }
 
             if (match)
-                match &= criteria.Collection?.ContainsBeatmap(Beatmap) ?? true;
+                match &= criteria.Collection?.Beatmaps.Contains(Beatmap) ?? true;
 
             Filtered.Value = !match;
         }
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 41ce0d65cd..9128160608 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.Select
                 Sort = sortMode.Value,
                 AllowConvertedBeatmaps = showConverted.Value,
                 Ruleset = ruleset.Value,
-                Collection = collectionDropdown?.Current.Value
+                Collection = collectionDropdown?.Current.Value.Collection
             };
 
             if (!minimumStars.IsDefault)
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index acab982945..66f164bca8 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Game.Beatmaps;
+using osu.Game.Collections;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Select.Filter;
 
@@ -56,7 +57,7 @@ namespace osu.Game.Screens.Select
         /// The collection to filter beatmaps from.
         /// </summary>
         [CanBeNull]
-        public CollectionFilter Collection;
+        public BeatmapCollection Collection;
 
         public struct OptionalRange<T> : IEquatable<OptionalRange<T>>
             where T : struct