diff --git a/NzbDrone.Core.Test/EpisodeSearchJobTest.cs b/NzbDrone.Core.Test/EpisodeSearchJobTest.cs
index 1faab1de6..1e7be7186 100644
--- a/NzbDrone.Core.Test/EpisodeSearchJobTest.cs
+++ b/NzbDrone.Core.Test/EpisodeSearchJobTest.cs
@@ -247,6 +247,9 @@ namespace NzbDrone.Core.Test
             mocker.GetMock<InventoryProvider>()
                 .Setup(c => c.IsQualityNeeded(It.Is<EpisodeParseResult>(d => d.Series != null && d.Episodes.Count != 0))).Returns(false);
 
+            mocker.GetMock<SceneNameMappingProvider>()
+                .Setup(s => s.GetSceneName(It.IsAny<int>())).Returns("");
+
             //Act
             mocker.Resolve<EpisodeSearchJob>().Start(new ProgressNotification("Test"), episode.EpisodeId);
 
@@ -295,6 +298,9 @@ namespace NzbDrone.Core.Test
             mocker.GetMock<InventoryProvider>()
                 .Setup(c => c.IsQualityNeeded(It.Is<EpisodeParseResult>(d => d.Series != null && d.Episodes.Count != 0))).Returns(false);
 
+            mocker.GetMock<SceneNameMappingProvider>()
+                .Setup(s => s.GetSceneName(71256)).Returns("The Daily Show");
+
             //Act
             mocker.Resolve<EpisodeSearchJob>().Start(new ProgressNotification("Test"), episode.EpisodeId);
 
@@ -347,7 +353,10 @@ namespace NzbDrone.Core.Test
                 .Returns(indexers);
 
             mocker.GetMock<InventoryProvider>()
-                .Setup(c => c.IsQualityNeeded(It.Is<EpisodeParseResult>(d => d.Series != null && d.Episodes.Count != 0))).Returns(false);
+                .Setup(c => c.IsQualityNeeded(It.Is<EpisodeParseResult>(d => d.Series != null && d.Episodes.Count != 0))).Returns(false);;
+
+            mocker.GetMock<SceneNameMappingProvider>()
+                .Setup(s => s.GetSceneName(It.IsAny<int>())).Returns("");
 
             //Act
             mocker.Resolve<EpisodeSearchJob>().Start(new ProgressNotification("Test"), episode.EpisodeId);
diff --git a/NzbDrone.Core.Test/SeriesProviderTest.cs b/NzbDrone.Core.Test/SeriesProviderTest.cs
index bd5086dd6..8adc1c234 100644
Binary files a/NzbDrone.Core.Test/SeriesProviderTest.cs and b/NzbDrone.Core.Test/SeriesProviderTest.cs differ
diff --git a/NzbDrone.Core/Parser.cs b/NzbDrone.Core/Parser.cs
index 0b561f017..bf259a852 100644
--- a/NzbDrone.Core/Parser.cs
+++ b/NzbDrone.Core/Parser.cs
@@ -46,7 +46,7 @@ namespace NzbDrone.Core
         private static readonly Regex NormalizeRegex = new Regex(@"((^|\W)(a|an|the|and|or|of)($|\W))|\W|(?:(?<=[^0-9]+)|\b)(?!(?:19\d{2}|20\d{2}))\d+(?=[^0-9ip]+|\b)",
                                                                  RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
-        private static readonly Regex SimpleTitleRegex = new Regex(@"480[i|p]|720[i|p]|1080[i|p]|[x|h]264|\\|\/|\<|\>|\?|\*|\:|\|",
+        private static readonly Regex SimpleTitleRegex = new Regex(@"480[i|p]|720[i|p]|1080[i|p]|[x|h]264|\<|\>|\?|\*|\:|\|",
                                                               RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
         /// <summary>
diff --git a/NzbDrone.Core/Providers/SceneNameMappingProvider.cs b/NzbDrone.Core/Providers/SceneNameMappingProvider.cs
index f40aa1e9b..fd6869edd 100644
--- a/NzbDrone.Core/Providers/SceneNameMappingProvider.cs
+++ b/NzbDrone.Core/Providers/SceneNameMappingProvider.cs
@@ -23,6 +23,11 @@ namespace NzbDrone.Core.Providers
             _httpProvider = httpProvider;
         }
 
+        public SceneNameMappingProvider()
+        {
+            
+        }
+
         public virtual bool UpdateMappings()
         {
             try