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/controllers/AudiopreviewController.php b/airtime_mvc/application/controllers/AudiopreviewController.php
index f827bbf08..4a55d8576 100644
--- a/airtime_mvc/application/controllers/AudiopreviewController.php
+++ b/airtime_mvc/application/controllers/AudiopreviewController.php
@@ -278,7 +278,7 @@ class AudiopreviewController extends Zend_Controller_Action
 
             $elementMap = array(
                 'element_title' => isset($track['track_title']) ? $track['track_title'] : "",
-                'element_artist' => isset($track['artist_name']) ? $track['artist_name'] : "",
+                'element_artist' => isset($track['creator']) ? $track['creator'] : "",
                 'element_position' => $position,
                 'element_id' => ++$position,
             );
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/application/models/Show.php b/airtime_mvc/application/models/Show.php
index 9fcaee13e..dd3a1e520 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -1832,7 +1832,7 @@ SELECT si.starts AS start_timestamp,
        s.url,
        starts,
        ends
-FROM cc_show_instances si,
+FROM cc_show_instances si
      LEFT JOIN cc_show s
      ON si.instance_id = s.id
 WHERE si.show_id = s.id
@@ -1875,7 +1875,7 @@ SELECT si.starts AS start_timestamp,
        s.url,
        starts,
        ends
-FROM cc_show_instances si,
+FROM cc_show_instances si
      LEFT JOIN cc_show s
      ON si.instance_id = s.id
 WHERE si.show_id = s.id
diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php
index 2d2b18894..b90051c7f 100644
--- a/airtime_mvc/application/models/ShowInstance.php
+++ b/airtime_mvc/application/models/ShowInstance.php
@@ -655,6 +655,9 @@ FROM (
                 0::INTEGER as type ,
                 f.id AS item_id,
                 f.track_title,
+                f.album_title AS album,
+                f.genre AS genre,
+                f.length AS length,
                 f.artist_name AS creator,
                 f.file_exists AS EXISTS,
                 f.filepath AS filepath
@@ -668,6 +671,9 @@ FROM (
                 1::INTEGER as type,
                 ws.id AS item_id,
                 (ws.name || ': ' || ws.url) AS title,
+                null AS album,
+                null AS genre,
+                ws.length AS length,
                 sub.login AS creator,
                 't'::boolean AS EXISTS,
                 ws.url AS filepath
@@ -688,8 +694,10 @@ SQL;
             $dt->setTimezone(new DateTimeZone(date_default_timezone_get()));
             $row["starts"] = $dt->format("Y-m-d H:i:s");
 
-            $formatter = new LengthFormatter($row["clip_length"]);
-            $row["clip_length"] = $formatter->format();
+            if (isset($row['length'])) {
+                $formatter = new LengthFormatter($row["length"]);
+                $row["length"] = $formatter->format();
+            }
         }
 
 
diff --git a/airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml b/airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml
index 103796adc..a935f3f99 100644
--- a/airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml
@@ -11,12 +11,12 @@
     </tr>
 <?php $i=0; ?>
 <?php foreach($this->showContent as $row): ?>
-    <tr id="au_<?php echo $row["file_id"] ?>" class="<?php if($i&1){echo "even";}else{echo "odd";}?>">
+    <tr id="au_<?php echo $row["item_id"] ?>" class="<?php if($i&1){echo "even";}else{echo "odd";}?>">
         <td><?php echo $row["starts"] ?></td>
         <td><?php echo $row["track_title"] ?></td>
-        <td><?php echo $row["artist_name"] ?></td>
-        <td><?php echo $row["album_title"] ?></td>
-        <td class="library_length"><?php echo $row["clip_length"] ?></td>
+        <td><?php echo $row["creator"] ?></td>
+        <td><?php echo $row["album"] ?></td>
+        <td class="library_length"><?php echo $row["length"] ?></td>
         <td><?php echo $row["genre"] ?></td>
     </tr>
 <?php $i=$i+1; ?>
diff --git a/airtime_mvc/public/index.php b/airtime_mvc/public/index.php
index e496f133c..062e2aed2 100644
--- a/airtime_mvc/public/index.php
+++ b/airtime_mvc/public/index.php
@@ -27,7 +27,7 @@ set_include_path(APPLICATION_PATH . '/models' . PATH_SEPARATOR . get_include_pat
 set_include_path(APPLICATION_PATH . '/controllers/plugins' . PATH_SEPARATOR . get_include_path());
 
 //Zend framework
-if (file_exists('/usr/share/php/libzend-framework-php')){
+if (file_exists('/usr/share/php/libzend-framework-php')) {
     set_include_path('/usr/share/php/libzend-framework-php' . PATH_SEPARATOR . get_include_path());
 }
 
@@ -39,5 +39,14 @@ $application = new Zend_Application(
     APPLICATION_ENV,
     APPLICATION_PATH . '/configs/application.ini'
 );
-$application->bootstrap()
+
+$sapi_type = php_sapi_name();
+if (substr($sapi_type, 0, 3) == 'cli') {
+    set_include_path(APPLICATION_PATH . PATH_SEPARATOR . get_include_path());
+    require_once("Bootstrap.php");
+} else {
+    $application->bootstrap()
             ->run();
+}
+
+
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"         }             ,