diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs
index 8aa92fb23d..b84de3b129 100644
--- a/osu.Game/Database/BeatmapDatabase.cs
+++ b/osu.Game/Database/BeatmapDatabase.cs
@@ -127,6 +127,11 @@ namespace osu.Game.Database
         {
             return connection.GetAllWithChildren<T>(filter, recursive);
         }
+        
+        public void GetChildren<T>(T item, bool recursive = true)
+        {
+            connection.GetChildren<T>(item, recursive);
+        }
 
         readonly Type[] validTypes = new[]
         {
diff --git a/osu.Game/GameModes/Play/BeatmapGroup.cs b/osu.Game/GameModes/Play/BeatmapGroup.cs
index 617c19acb1..ef0c78a62e 100644
--- a/osu.Game/GameModes/Play/BeatmapGroup.cs
+++ b/osu.Game/GameModes/Play/BeatmapGroup.cs
@@ -217,12 +217,12 @@ namespace osu.Game.GameModes.Play
                         // TODO: Make these italic
                         new SpriteText
                         {
-                            Text = this.beatmapSet.Metadata.TitleUnicode ?? this.beatmapSet.Metadata.Title,
+                            Text = this.beatmapSet.Metadata.Title ?? this.beatmapSet.Metadata.TitleUnicode,
                             TextSize = 20
                         },
                         new SpriteText
                         {
-                            Text = this.beatmapSet.Metadata.ArtistUnicode ?? this.beatmapSet.Metadata.Artist,
+                            Text = this.beatmapSet.Metadata.Artist ?? this.beatmapSet.Metadata.ArtistUnicode,
                             TextSize = 16
                         },
                         new FlowContainer
diff --git a/osu.Game/GameModes/Play/PlaySongSelect.cs b/osu.Game/GameModes/Play/PlaySongSelect.cs
index 91cd851ef4..1815925c94 100644
--- a/osu.Game/GameModes/Play/PlaySongSelect.cs
+++ b/osu.Game/GameModes/Play/PlaySongSelect.cs
@@ -59,6 +59,9 @@ namespace osu.Game.GameModes.Play
         private void addBeatmapSet(BeatmapSetInfo beatmapSet)
         {
             beatmapSet = beatmaps.GetWithChildren<BeatmapSetInfo>(beatmapSet.BeatmapSetID);
+            beatmapSet.Beatmaps.ForEach(b => beatmaps.GetChildren(b));
+            beatmapSet.Beatmaps = beatmapSet.Beatmaps.OrderBy(b => b.BaseDifficulty.OverallDifficulty)
+                .ToList();
             var group = new BeatmapGroup(beatmapSet, beatmapResources, beatmapTextureResources);
             group.SetSelected += selectBeatmapSet;
             group.BeatmapSelected += selectBeatmap;