diff --git a/airtime_mvc/application/controllers/ListenerstatController.php b/airtime_mvc/application/controllers/ListenerstatController.php
index d0af81593..d80bcf871 100644
--- a/airtime_mvc/application/controllers/ListenerstatController.php
+++ b/airtime_mvc/application/controllers/ListenerstatController.php
@@ -46,9 +46,6 @@ class ListenerstatController extends Zend_Controller_Action
                 'his_time_end' => $end->format("H:i")
         ));
         
-        $allMPs = Application_Model_ListenerStat::getAllMPNames();
-        
-        $this->view->mps = $allMPs;
         $this->view->date_form = $form;
     }
     
diff --git a/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js b/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js
index 1b5c5393f..02ebefab8 100644
--- a/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js
+++ b/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js
@@ -63,6 +63,12 @@ function plot(datasets){
                     if (this.checked)
                     {         
                          data.push(datasets[this.id]);
+                         if (firstTimestamp.getTime() > datasets[this.id].data[0][0].getTime()) {
+                             firstTimestamp = datasets[this.id].data[0][0];
+                         }
+                         if (lastTimestamp.getTime() < datasets[this.id].data[datasets[this.id].data.length-1][0].getTime()) {
+                             lastTimestamp = datasets[this.id].data[datasets[this.id].data.length-1][0];
+                         }
                     }
                     else
                     {