diff --git a/src/gameservers/views.py b/src/gameservers/views.py
index 09fa4b7..74043a0 100644
--- a/src/gameservers/views.py
+++ b/src/gameservers/views.py
@@ -13,13 +13,8 @@ class ServerDetailView(generic.DetailView):
     def get_context_data(self, **kwargs):
         context = super(ServerDetailView, self).get_context_data(**kwargs)
         server = context['server']
-
         history = PlayerHistory()
         points = history.get_points(server)
         context['player_history'] = points
-
-        timestamp, players = points[0]
-        context['last_updated'] = timestamp
-        context['online_players'] = players
         return context
 
diff --git a/src/templates/gameservers/server_detail.html b/src/templates/gameservers/server_detail.html
index b00f5b9..1c4cc7f 100644
--- a/src/templates/gameservers/server_detail.html
+++ b/src/templates/gameservers/server_detail.html
@@ -18,10 +18,10 @@
     {% endif %}
 
     <h2>Server History</h2>
-    <p>Last updated <span title="{{last_updated|date:'r'}} GMT">
-        {{last_updated|timesince}}
+    <p>Last updated <span title="{{server.last_updated|date:'r'}} GMT">
+        {{server.last_updated|timesince}}
     </span>ago.</p>
-    <p>Online players: {{online_players}}</p>
+    <p>Online players: {{server.current_players}}</p>
 
     <div id="chart"></div>
     <div id="tooltip"></div>