diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php
index 6699946b4..63e594bb8 100644
--- a/airtime_mvc/application/models/Schedule.php
+++ b/airtime_mvc/application/models/Schedule.php
@@ -1063,20 +1063,46 @@ SQL;
          * In both cases (new and edit) we only grab shows that
          * are scheduled 2 days prior
          */
+        $se = $show_end->format('Y-m-d H:i:s');
         if ($update) {
             $sql = "SELECT id, starts, ends FROM ".$CC_CONFIG["showInstances"]."
                     where (ends <= '{$show_end->format('Y-m-d H:i:s')}'
                     or starts <= '{$show_end->format('Y-m-d H:i:s')}')
                     and date(starts) >= (date('{$show_end->format('Y-m-d H:i:s')}') - INTERVAL '2 days')
                     and modified_instance = false and id != ".$instanceId. " order by ends";
+            $stmt = $con->prepare("SELECT id, starts, ends FROM :showInstances
+                    where (ends <= :show_end1
+                    or starts <= :show_end2)
+                    and date(starts) >= (date(:show_end3) - INTERVAL '2 days')
+                    and modified_instance = false and id != :instanceId order by ends");
+            $stmt->execute(array(
+                ':showInstances' => $CC_CONFIG['showInstances'],
+                ':show_end1'     => $se,
+                ':show_end2'     => $se,
+                ':show_end3'     => $se,
+                ':instanceId'    => $instanceId
+            ));
         } else {
+            // TODO : Remove raw sql later
             $sql = "SELECT id, starts, ends FROM ".$CC_CONFIG["showInstances"]."
                     where (ends <= '{$show_end->format('Y-m-d H:i:s')}'
                     or starts <= '{$show_end->format('Y-m-d H:i:s')}')
                     and date(starts) >= (date('{$show_end->format('Y-m-d H:i:s')}') - INTERVAL '2 days')
                     and modified_instance = false order by ends";
+            $stmt = $con->prepare("SELECT id, starts, ends FROM :showInstances
+                    where (ends <= :show_end1
+                    or starts <= :show_end2)
+                    and date(starts) >= (date(:show_end3) - INTERVAL '2 days')
+                    and modified_instance = false order by ends");
+            $stmt->execute(array(
+                ':showInstances' => $CC_CONFIG['showInstances'],
+                ':show_end1'     => $se,
+                ':show_end2'     => $se,
+                ':show_end3'     => $se,
+            ));
         }
-        $rows = $con->query($sql);
+        //$rows = $con->query($sql);
+        $rows->fetchAll();
 
         foreach ($rows as $row) {
             $start = new DateTime($row["starts"], new DateTimeZone('UTC'));