diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs
index e11ea797ca..ab2a612176 100644
--- a/osu.Game/Database/BeatmapDatabase.cs
+++ b/osu.Game/Database/BeatmapDatabase.cs
@@ -271,12 +271,14 @@ namespace osu.Game.Database
         {
             var beatmapSetInfo = Query<BeatmapSetInfo>().FirstOrDefault(s => s.ID == beatmapInfo.BeatmapSetInfoID);
 
-            //we need metadata
-            GetChildren(beatmapSetInfo);
-
             if (beatmapSetInfo == null)
                 throw new InvalidOperationException($@"Beatmap set {beatmapInfo.BeatmapSetInfoID} is not in the local database.");
 
+            //we need metadata
+            GetChildren(beatmapSetInfo);
+            foreach (var b in beatmapSetInfo.Beatmaps)
+                GetChildren(b);
+
             if (beatmapInfo.Metadata == null)
                 beatmapInfo.Metadata = beatmapSetInfo.Metadata;
 
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index f104bf9a37..06aaea041a 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Screens.Select
                 }
             }
 
-            int startIndex = groups.IndexOf(selectedGroup);
+            int startIndex = Math.Max(0, groups.IndexOf(selectedGroup));
             int index = startIndex;
 
             do
@@ -221,7 +221,12 @@ namespace osu.Game.Screens.Select
         private BeatmapGroup createGroup(BeatmapSetInfo beatmapSet)
         {
             database.GetChildren(beatmapSet);
-            beatmapSet.Beatmaps.ForEach(b => { if (b.Metadata == null) b.Metadata = beatmapSet.Metadata; });
+            beatmapSet.Beatmaps.ForEach(b =>
+            {
+                database.GetChildren(b);
+                if (b.Metadata == null)
+                    b.Metadata = beatmapSet.Metadata;
+            });
 
             return new BeatmapGroup(beatmapSet, database)
             {