diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 2435b4e87..cd0ed19d1 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -511,7 +511,7 @@ class ApiController extends Zend_Controller_Action
             }
         } elseif ($mode == "delete") {
             $filepath = $md['MDATA_KEY_FILEPATH'];
-            //$filepath = str_replace("\\", "", $filepath);
+            $filepath = str_replace("\\", "", $filepath);
             $file = Application_Model_StoredFile::RecallByFilepath($filepath);
 
             if (is_null($file)) {
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'));
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index c2d5f8e70..c37522d87 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -21,6 +21,7 @@ var AIRTIME = (function(AIRTIME) {
         "mtime"       : "n",
         "lptime"      : "n",
         "disc_number" : "n",
+        "encoded_by"  : "s",
         "genre"       : "s",
         "isrc_number" : "s",
         "label"       : "s",
@@ -406,7 +407,7 @@ var AIRTIME = (function(AIRTIME) {
               /* Bit Rate      */  { "sTitle" : "Bit Rate"      , "mDataProp" : "bit_rate"     , "bVisible"    : false                 , "sClass"      : "library_bitrate"       , "sWidth" : "80px"         }             , 
               /* Sample Rate   */  { "sTitle" : "Sample"        , "mDataProp" : "sample_rate"  , "bVisible"    : false                 , "sClass"      : "library_sr"            , "sWidth" : "80px"         }             , 
               /* ISRC Number   */  { "sTitle" : "ISRC"          , "mDataProp" : "isrc_number"  , "bVisible"    : false                 , "sClass"      : "library_isrc"          , "sWidth" : "150px"        }             , 
-              /* Encoded       */  { "sTitle" : "Encoded"       , "mDataProp" : "encoded_by"   , "bVisible"    : false                 , "sClass"      : "library_encoded"       , "sWidth" : "150px"        }             , 
+              /* Encoded       */  { "sTitle" : "Encoded By"    , "mDataProp" : "encoded_by"   , "bVisible"    : false                 , "sClass"      : "library_encoded"       , "sWidth" : "150px"        }             , 
               /* Label         */  { "sTitle" : "Label"         , "mDataProp" : "label"        , "bVisible"    : false                 , "sClass"      : "library_label"         , "sWidth" : "125px"        }             , 
               /* Copyright     */  { "sTitle" : "Copyright"     , "mDataProp" : "copyright"    , "bVisible"    : false                 , "sClass"      : "library_copyright"     , "sWidth" : "125px"        }             , 
               /* Mime          */  { "sTitle" : "Mime"          , "mDataProp" : "mime"         , "bVisible"    : false                 , "sClass"      : "library_mime"          , "sWidth" : "80px"         }             ,