diff --git a/src/NzbDrone.Api/History/HistoryModule.cs b/src/NzbDrone.Api/History/HistoryModule.cs
index 8a61f1d45..a17b9963c 100644
--- a/src/NzbDrone.Api/History/HistoryModule.cs
+++ b/src/NzbDrone.Api/History/HistoryModule.cs
@@ -76,8 +76,6 @@ private PagingResource<HistoryResource> GetHistory(PagingResource<HistoryResourc
                 pagingSpec.FilterExpression = h => h.MovieId == i;
             }
 
-            var pg = _historyService.Paged(pagingSpec);
-
             return ApplyToPage(_historyService.Paged, pagingSpec, MapToResource);
         }
 
diff --git a/src/NzbDrone.Core/History/HistoryRepository.cs b/src/NzbDrone.Core/History/HistoryRepository.cs
index 243db5f4e..bc0a54a5a 100644
--- a/src/NzbDrone.Core/History/HistoryRepository.cs
+++ b/src/NzbDrone.Core/History/HistoryRepository.cs
@@ -73,8 +73,11 @@ public void DeleteForSeries(int seriesId)
 
         protected override SortBuilder<History> GetPagedQuery(QueryBuilder<History> query, PagingSpec<History> pagingSpec)
         {
-            var baseQuery = query.Join<History, Series>(JoinType.Inner, h => h.Series, (h, s) => h.SeriesId == s.Id)
-                                 .Join<History, Episode>(JoinType.Inner, h => h.Episode, (h, e) => h.EpisodeId == e.Id);
+            var baseQuery = query/*.Join<History, Series>(JoinType.Inner, h => h.Series, (h, s) => h.SeriesId == s.Id)
+                                 .Join<History, Episode>(JoinType.Inner, h => h.Episode, (h, e) => h.EpisodeId == e.Id)*/
+                                 .Join<History, Movie>(JoinType.Inner, h => h.Movie, (h, e) => h.MovieId == e.Id);
+
+
 
             return base.GetPagedQuery(baseQuery, pagingSpec);
         }
diff --git a/src/UI/Movies/Details/MoviesDetailsTemplate.hbs b/src/UI/Movies/Details/MoviesDetailsTemplate.hbs
index cce213b01..3a63cd045 100644
--- a/src/UI/Movies/Details/MoviesDetailsTemplate.hbs
+++ b/src/UI/Movies/Details/MoviesDetailsTemplate.hbs
@@ -35,7 +35,7 @@
         <div id="info" class="movie-info"></div>
     </div>
 </div>
-<div id="seasons">
+<div id="movie-info">
   <ul class="nav nav-tabs" id="myTab">
       <li><a href="#movie-history" class="x-movie-history">History</a></li>
       <li><a href="#movie-search" class="x-movie-search">Search</a></li>
diff --git a/src/UI/Movies/History/NoHistoryViewTemplate.hbs b/src/UI/Movies/History/NoHistoryViewTemplate.hbs
index 561e84d59..244d82d65 100644
--- a/src/UI/Movies/History/NoHistoryViewTemplate.hbs
+++ b/src/UI/Movies/History/NoHistoryViewTemplate.hbs
@@ -1,3 +1,3 @@
 <p class="text-warning">
-    No history for this episode.
-</p>
\ No newline at end of file
+    No history for this movie.
+</p>
diff --git a/src/UI/Movies/movies.less b/src/UI/Movies/movies.less
index 08fca5152..57ff91ed4 100644
--- a/src/UI/Movies/movies.less
+++ b/src/UI/Movies/movies.less
@@ -272,7 +272,7 @@
   }
 }
 
-.episode-detail-modal {
+#movie-info {
 
   .episode-info {
     margin-bottom : 10px;