diff --git a/NzbDrone.Backbone/Calendar/CalendarCollectionView.js b/NzbDrone.Backbone/Calendar/CalendarCollectionView.js
index 16062b9b0..bf1a26fed 100644
--- a/NzbDrone.Backbone/Calendar/CalendarCollectionView.js
+++ b/NzbDrone.Backbone/Calendar/CalendarCollectionView.js
@@ -37,10 +37,11 @@ define(['app', 'Calendar/CalendarItemView'], function (app) {
         getEvents: function(start, end, callback){
             var bbView = NzbDrone.Calendar.CalendarCollectionView.Instance;
 
-
+            var startDate = Date.create(start).format(Date.ISO8601_DATETIME);
+            var endDate = Date.create(end).format(Date.ISO8601_DATETIME);
 
             bbView.calendar.fetch({
-                data:{ start: Date.create(start).format(Date.ISO8601_DATETIME), end: Date.create(end).format(Date.ISO8601_DATETIME) },
+                data:{ start: startDate, end: endDate },
                 success:function (calendarCollection) {
                     callback(calendarCollection.toJSON());
                 }
diff --git a/NzbDrone.Backbone/Index.html b/NzbDrone.Backbone/Index.html
index c446dac30..4543dfa61 100644
--- a/NzbDrone.Backbone/Index.html
+++ b/NzbDrone.Backbone/Index.html
@@ -46,7 +46,7 @@
                 <div class="span12">
                     <ul id="main-menu">
                         <li><a href="/"><i class="icon-film"></i><br>Series</a></li>
-                        <li><a href="/upcoming"><i class="icon-calendar"></i><br>Calendar</a></li>
+                        <li><a href="/calendar"><i class="icon-calendar"></i><br>Calendar</a></li>
                         <li><span class="label label-important pull-right">08</span><a href="history"><i class="icon-time"></i><br>History</a></li>
                         <li><span class="label label-important pull-right">04</span><a href="missing"><i class="icon-folder-open"></i><br>Missing</a></li>
                         <li><a href="settings"><i class="icon-cogs"></i><br>Settings</a></li>
diff --git a/NzbDrone.Core/Providers/TvDbProvider.cs b/NzbDrone.Core/Providers/TvDbProvider.cs
index d3184ff10..763b95db4 100644
--- a/NzbDrone.Core/Providers/TvDbProvider.cs
+++ b/NzbDrone.Core/Providers/TvDbProvider.cs
@@ -99,6 +99,8 @@ namespace NzbDrone.Core.Providers
                 {
                     episode.AirDate = null;
                 }
+
+                episodes.Add(episode);
             }
 
             return episodes;