diff --git a/osu.Game/Database/BeatmapMetadata.cs b/osu.Game/Database/BeatmapMetadata.cs
index 098c524cc3..ebca0f1cad 100644
--- a/osu.Game/Database/BeatmapMetadata.cs
+++ b/osu.Game/Database/BeatmapMetadata.cs
@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System.Linq;
 using SQLite.Net.Attributes;
 
 namespace osu.Game.Database
@@ -31,6 +32,6 @@ namespace osu.Game.Database
             TitleUnicode,
             Source,
             Tags
-        };
+        }.Where(s => !string.IsNullOrEmpty(s)).ToArray();
     }
 }
\ No newline at end of file
diff --git a/osu.Game/Overlays/Music/PlaylistList.cs b/osu.Game/Overlays/Music/PlaylistList.cs
index 418fcd41e8..c7909f1a63 100644
--- a/osu.Game/Overlays/Music/PlaylistList.cs
+++ b/osu.Game/Overlays/Music/PlaylistList.cs
@@ -73,7 +73,14 @@ namespace osu.Game.Overlays.Music
         private class ItemSearchContainer : FillFlowContainer<PlaylistItem>, IHasFilterableChildren
         {
             public string[] FilterTerms => new string[] { };
-            public bool MatchingCurrentFilter { set { } }
+            public bool MatchingCurrentFilter
+            {
+                set
+                {
+                    if (value)
+                        InvalidateLayout();
+                }
+            }
 
             public IEnumerable<IFilterable> FilterableChildren => Children;
 
diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs
index 3865ed246f..92b8addd97 100644
--- a/osu.Game/Overlays/Music/PlaylistOverlay.cs
+++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.Music
 
         private readonly Bindable<WorkingBeatmap> beatmapBacking = new Bindable<WorkingBeatmap>();
 
-        protected IEnumerable<BeatmapSetInfo> BeatmapSets;
+        public IEnumerable<BeatmapSetInfo> BeatmapSets;
 
         [BackgroundDependencyLoader]
         private void load(OsuGameBase game, BeatmapDatabase beatmaps, OsuColour colours)
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index cf5a2fdee1..91d35db3bb 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Diagnostics;
+using System.Linq;
 using System.Threading.Tasks;
 using OpenTK;
 using OpenTK.Graphics;
@@ -260,17 +261,36 @@ namespace osu.Game.Overlays
         }
 
         private WorkingBeatmap current;
-        private TransformDirection queuedDirection = TransformDirection.Next;
+        private TransformDirection? queuedDirection;
 
         private void beatmapChanged(WorkingBeatmap beatmap)
         {
             progressBar.IsEnabled = beatmap != null;
 
             bool audioEquals = beatmapBacking.Value?.BeatmapInfo?.AudioEquals(current?.BeatmapInfo) ?? false;
+
+            TransformDirection direction;
+
+            if (audioEquals)
+                direction = TransformDirection.None;
+            else if (queuedDirection.HasValue)
+            {
+                direction = queuedDirection.Value;
+                queuedDirection = null;
+            }
+            else
+            {
+                //figure out the best direction based on order in playlist.
+                var last = current == null ? -1 : playlist.BeatmapSets.TakeWhile(b => b.ID != current.BeatmapSetInfo.ID).Count();
+                var next = beatmapBacking.Value == null ? -1 : playlist.BeatmapSets.TakeWhile(b => b.ID != beatmapBacking.Value.BeatmapSetInfo.ID).Count();
+
+                direction = last > next ? TransformDirection.Prev : TransformDirection.Next;
+            }
+
             current = beatmapBacking.Value;
 
-            updateDisplay(beatmapBacking, audioEquals ? TransformDirection.None : queuedDirection);
-            queuedDirection = TransformDirection.Next;
+            updateDisplay(beatmapBacking, direction);
+            queuedDirection = null;
         }
 
         private ScheduledDelegate pendingBeatmapSwitch;