diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index be48c997ea..9277310efc 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         public void TestImportWhenClosed()
         {
             //unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
-            using (HeadlessGameHost host = new HeadlessGameHost())
+            using (HeadlessGameHost host = new HeadlessGameHost("TestImportWhenClosed"))
             {
                 var osu = loadOsu(host);
 
@@ -69,7 +69,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         public void TestImportWhenFileOpen()
         {
             //unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
-            using (HeadlessGameHost host = new HeadlessGameHost())
+            using (HeadlessGameHost host = new HeadlessGameHost("TestImportWhenFileOpen"))
             {
                 var osu = loadOsu(host);
 
diff --git a/osu.Game/Overlays/Direct/Header.cs b/osu.Game/Overlays/Direct/Header.cs
index 2c50fb453f..77743a3a4b 100644
--- a/osu.Game/Overlays/Direct/Header.cs
+++ b/osu.Game/Overlays/Direct/Header.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Overlays.Direct
 
         public Header()
         {
-            Tabs.Current.Value = DirectTab.Search;
+            Tabs.Current.Value = DirectTab.NewestMaps;
             Tabs.Current.TriggerChange();
         }
     }
diff --git a/osu.Game/Overlays/DirectOverlay.cs b/osu.Game/Overlays/DirectOverlay.cs
index 9c07e1087f..5b5003b30f 100644
--- a/osu.Game/Overlays/DirectOverlay.cs
+++ b/osu.Game/Overlays/DirectOverlay.cs
@@ -251,7 +251,7 @@ namespace osu.Game.Overlays
 
             if (Header.Tabs.Current.Value == DirectTab.Search && (Filter.Search.Text == string.Empty || currentQuery == string.Empty)) return;
 
-            getSetsRequest = new GetBeatmapSetsRequest(currentQuery,
+            getSetsRequest = new GetBeatmapSetsRequest(currentQuery.Value ?? string.Empty,
                                                        ((FilterControl)Filter).Ruleset.Value,
                                                        Filter.DisplayStyleControl.Dropdown.Current.Value,
                                                        Filter.Tabs.Current.Value); //todo: sort direction (?)