diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php
index d0cc6bebd..a5bbf60a2 100644
--- a/airtime_mvc/application/models/Playlist.php
+++ b/airtime_mvc/application/models/Playlist.php
@@ -172,12 +172,12 @@ class Application_Model_Playlist
         $rows = $query->find($this->con);
          */
         $sql = <<<"EOT"
-((SELECT pc.file_id as id, pc.type, pc.position, pc.cliplength as length, pc.cuein, pc.cueout, pc.fadein, pc.fadeout, 
+((SELECT pc.id as id, pc.type, pc.position, pc.cliplength as length, pc.cuein, pc.cueout, pc.fadein, pc.fadeout, 
     f.track_title, f.artist_name as creator, f.file_exists as exists, f.filepath as path FROM cc_playlistcontents AS pc 
     LEFT JOIN cc_files AS f ON pc.file_id=f.id WHERE pc.playlist_id = {$this->id} AND type = 0)
 UNION ALL
-(SELECT pc.file_id as id, pc.type, pc.position, pc.cliplength as length, pc.cuein, pc.cueout, pc.fadein, pc.fadeout, 
-ws.name as title, ws.login as creator, NULL::boolean as exists, ws.url as path FROM cc_playlistcontents AS pc 
+(SELECT pc.id as id, pc.type, pc.position, pc.cliplength as length, pc.cuein, pc.cueout, pc.fadein, pc.fadeout, 
+(ws.name || ': ' || ws.url) as title, ws.login as creator, 't'::boolean as exists, ws.url as path FROM cc_playlistcontents AS pc 
 LEFT JOIN cc_webstream AS ws on pc.file_id=ws.id WHERE pc.playlist_id = {$this->id} AND type = 1));
 EOT;
         Logging::debug($sql);
@@ -201,17 +201,18 @@ filepath
 album_title
 #length
 */
+
         $offset = 0;
         foreach ($rows as &$row) {
             Logging::log($row);
 
-            $clipSec = Application_Model_Playlist::playlistTimeToSeconds($row['cliplength']);
+            $clipSec = Application_Model_Playlist::playlistTimeToSeconds($row['length']);
             $offset += $clipSec;
             $offset_cliplength = Application_Model_Playlist::secondsToPlaylistTime($offset);
     
             //format the length for UI.
-            $formatter = new LengthFormatter($row['cliplength']);
-            $row['cliplength'] = $formatter->format();
+            $formatter = new LengthFormatter($row['length']);
+            $row['length'] = $formatter->format();
     
             $formatter = new LengthFormatter($offset_cliplength);
             $row['offset'] = $formatter->format();
diff --git a/airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml b/airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml
index 83d8c3e3b..87cefbb55 100644
--- a/airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml
+++ b/airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml
@@ -32,7 +32,7 @@
         <span><?php echo $row["track_title"] ?></span>
         <span><?php echo $row["creator"] ?></span>
         <span><?php echo $row["album_title"] ?></span>
-        <span><?php echo $row["cliplength"] ?></span>
+        <span><?php echo $row["length"] ?></span>
     </div>
     <?php endforeach; ?>
 </div>
diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml
index 65b73e348..6639f38dd 100644
--- a/airtime_mvc/application/views/scripts/playlist/update.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/update.phtml
@@ -17,7 +17,7 @@ if (count($items)) : ?>
             <?php endif; ?>   
             
             <div class="text-row top">
-                <span class="spl_playlength"><?php echo $item["cliplength"] ?></span>
+                <span class="spl_playlength"><?php echo $item["length"] ?></span>
                 <span class="spl_cue ui-state-default"></span>
                 <span class="spl_title"><?php echo $item['track_title'] ?></span>
             </div>