diff --git a/airtime_mvc/application/models/airtime/CcShow.php b/airtime_mvc/application/models/airtime/CcShow.php
index 5e300f00c..1ccbbcf92 100644
--- a/airtime_mvc/application/models/airtime/CcShow.php
+++ b/airtime_mvc/application/models/airtime/CcShow.php
@@ -155,7 +155,14 @@ class CcShow extends BaseCcShow {
      */
     public function getCcShowInstancess($criteria = null, PropelPDO $con = null)
     {
-        if(null === $this->collCcShowInstancess || null !== $criteria) {
+        return CcShowInstancesQuery::create(null, $criteria)
+                    ->filterByCcShow($this)
+                    ->filterByDbModifiedInstance(false)
+                    ->filterByDbEnds(gmdate("Y-m-d H:i:s"), criteria::GREATER_THAN)
+                    ->orderByDbId()
+                    ->find($con);
+
+        /*if(null === $this->collCcShowInstancess || null !== $criteria) {
             if ($this->isNew() && null === $this->collCcShowInstancess) {
                 // return empty collection
                 $this->initCcShowInstancess();
@@ -172,7 +179,7 @@ class CcShow extends BaseCcShow {
                 $this->collCcShowInstancess = $collCcShowInstancess;
             }
         }
-        return $this->collCcShowInstancess;
+        return $this->collCcShowInstancess;*/
     }
 
     public function getInstanceIds() {
diff --git a/airtime_mvc/application/services/ShowService.php b/airtime_mvc/application/services/ShowService.php
index 66885ac14..32aeb5da9 100644
--- a/airtime_mvc/application/services/ShowService.php
+++ b/airtime_mvc/application/services/ShowService.php
@@ -201,23 +201,23 @@ class Application_Service_ShowService
                     break;
                 case REPEAT_WEEKLY:
                     $this->createRepeatingInstances($day, $populateUntil, REPEAT_WEEKLY,
-                        new DateInterval("P7D"), $daysAdded, $fillInstances);
+                        new DateInterval("P7D"), $daysAdded);
                     break;
                 case REPEAT_BI_WEEKLY:
                     $this->createRepeatingInstances($day, $populateUntil, REPEAT_BI_WEEKLY,
-                        new DateInterval("P14D"), $daysAdded, $fillInstances);
+                        new DateInterval("P14D"), $daysAdded);
                     break;
                 case REPEAT_MONTHLY_MONTHLY:
-                    $this->createMonthlyMonthlyRepeatInstances($day, $populateUntil, $fillInstances);
+                    $this->createMonthlyMonthlyRepeatInstances($day, $populateUntil);
                     break;
                 case REPEAT_MONTHLY_WEEKLY:
                     $this->createRepeatingInstances($day, $populateUntil, REPEAT_MONTHLY_WEEKLY,
-                        null, $daysAdded, $fillInstances);
+                        null, $daysAdded);
                     break;
             }
         }
 
-        if (isset($this->ccShow) && $fillInstances) {
+        if (isset($this->ccShow) && ($this->isUpdate || $fillInstances)) {
             Application_Service_SchedulerService::fillLinkedShows(
                 $this->ccShow);
         }
@@ -824,7 +824,7 @@ SQL;
      * @param unknown_type $isRebroadcast
      */
     private function createRepeatingInstances($showDay, $populateUntil,
-        $repeatType, $repeatInterval, $daysAdded=null, $fillInstances)
+        $repeatType, $repeatInterval, $daysAdded=null)
     {
         $show_id       = $showDay->getDbShowId();
         $first_show    = $showDay->getDbFirstShow(); //non-UTC