diff --git a/NzbDrone.Core/History/HistoryService.cs b/NzbDrone.Core/History/HistoryService.cs
index d7a4c7f8a..d1200780c 100644
--- a/NzbDrone.Core/History/HistoryService.cs
+++ b/NzbDrone.Core/History/HistoryService.cs
@@ -51,7 +51,7 @@ namespace NzbDrone.Core.History
 
         public virtual QualityModel GetBestQualityInHistory(int episodeId)
         {
-            return _historyRepository.GetBestQualityInHistory(episodeId).OrderByDescending(q => q).FirstOrDefault();
+            return _historyRepository.GetEpisodeHistory(episodeId).OrderByDescending(q => q).FirstOrDefault();
         }
 
         public void Handle(EpisodeGrabbedEvent message)
diff --git a/UI/Settings/DownloadClient/DownloadClientTemplate.html b/UI/Settings/DownloadClient/DownloadClientTemplate.html
index b034f751f..a0105509d 100644
--- a/UI/Settings/DownloadClient/DownloadClientTemplate.html
+++ b/UI/Settings/DownloadClient/DownloadClientTemplate.html
@@ -20,32 +20,12 @@
         <label class="control-label">Unsorted TV Directory</label>
 
         <div class="controls">
-            <input type="text" placeholder="C:\Unsorted TV" name="downloadClientDropDirectory" class="x-path"/>
+            <input type="text" placeholder="C:\Unsorted TV" name="downloadClientTvDirectory" class="x-path"/>
             <span class="help-inline">
                 <i class="icon-question-sign" title="The directory where your download client downloads TV shows to."></i>
             </span>
         </div>
     </div>
-
-    <div class="control-group">
-        <label class="control-label">Use Scene Name</label>
-
-        <div class="controls">
-            <label class="checkbox toggle well">
-                <input type="checkbox" name="downloadClientUseSceneName"/>
-                <p>
-                    <span>Yes</span>
-                    <span>No</span>
-                </p>
-
-                <div class="btn btn-primary slide-button"></div>
-            </label>
-
-            <span class="help-inline-checkbox">
-                <i class="icon-question-sign" title="Use Scene name when adding NZB to queue?"></i>
-            </span>
-        </div>
-    </div>
 </fieldset>
 
 <fieldset class="x-sab-config">