diff --git a/NzbDrone.Core/Providers/SearchProvider.cs b/NzbDrone.Core/Providers/SearchProvider.cs
index 299176b2e..c9830fdb7 100644
--- a/NzbDrone.Core/Providers/SearchProvider.cs
+++ b/NzbDrone.Core/Providers/SearchProvider.cs
@@ -262,7 +262,9 @@ namespace NzbDrone.Core.Providers
             var items = new List<SearchHistoryItem>();
             searchResult.Successes = new List<int>();
 
-            foreach (var episodeParseResult in reports.OrderByDescending(c => c.Quality).ThenBy(c => c.Age))
+            foreach (var episodeParseResult in reports.OrderByDescending(c => c.Quality)
+                                                        .ThenBy(c => c.EpisodeNumbers.Min())
+                                                        .ThenBy(c => c.Age))
             {
                 try
                 {
diff --git a/NzbDrone.Web/Controllers/UpcomingController.cs b/NzbDrone.Web/Controllers/UpcomingController.cs
index c3bf6b8e0..3a06bf795 100644
--- a/NzbDrone.Web/Controllers/UpcomingController.cs
+++ b/NzbDrone.Web/Controllers/UpcomingController.cs
@@ -23,7 +23,7 @@ namespace NzbDrone.Web.Controllers
 
         public ActionResult Index()
         {
-            var upcomingEpisodes = GetUpcomingEpisodeModels(_upcomingEpisodesProvider.RecentEpisodes());
+            var upcomingEpisodes = GetUpcomingEpisodeModels(_upcomingEpisodesProvider.UpcomingEpisodes());
 
 
             var upcoming = new UpcomingEpisodesModel