diff --git a/application/controllers/ScheduleController.php b/application/controllers/ScheduleController.php
index 32c83a70b..fadbdb161 100644
--- a/application/controllers/ScheduleController.php
+++ b/application/controllers/ScheduleController.php
@@ -146,6 +146,11 @@ class ScheduleController extends Zend_Controller_Action
 		$end = $this->_getParam('end');
 		$showId = $this->_getParam('showId');
 		$day = $this->_getParam('day');
+		$search = $this->_getParam('search', null);
+
+		if($search == "") {
+			$search = null;
+		}
 
 		$userInfo = Zend_Auth::getInstance()->getStorage()->read();
 
@@ -159,7 +164,7 @@ class ScheduleController extends Zend_Controller_Action
 			$show->scheduleShow($start, array($plId));
 		}
 
-		$this->view->playlists = $show->searchPlaylistsForShow($day);
+		$this->view->playlists = $show->searchPlaylistsForShow($day, $search);
 		$this->view->showContent = $show->getShowContent($start);
 
 		$this->view->choice = $this->view->render('schedule/find-playlists.phtml');
diff --git a/application/views/scripts/schedule/find-playlists.ajax.phtml b/application/views/scripts/schedule/find-playlists.ajax.phtml
index f5d6626cf..185ce5f98 100644
--- a/application/views/scripts/schedule/find-playlists.ajax.phtml
+++ b/application/views/scripts/schedule/find-playlists.ajax.phtml
@@ -2,4 +2,7 @@
 	if(count($this->playlists) > 0) {
 		echo $this->partialLoop('schedule/find-playlists-partial.phtml', $this->playlists); 
 	}
+	else {
+		echo "No Playlists Fit Duration";
+	}
 ?>
diff --git a/application/views/scripts/schedule/find-playlists.phtml b/application/views/scripts/schedule/find-playlists.phtml
index f5d6626cf..185ce5f98 100644
--- a/application/views/scripts/schedule/find-playlists.phtml
+++ b/application/views/scripts/schedule/find-playlists.phtml
@@ -2,4 +2,7 @@
 	if(count($this->playlists) > 0) {
 		echo $this->partialLoop('schedule/find-playlists-partial.phtml', $this->playlists); 
 	}
+	else {
+		echo "No Playlists Fit Duration";
+	}
 ?>
diff --git a/application/views/scripts/schedule/schedule-show.phtml b/application/views/scripts/schedule/schedule-show.phtml
index eee852c11..bc315759c 100644
--- a/application/views/scripts/schedule/schedule-show.phtml
+++ b/application/views/scripts/schedule/schedule-show.phtml
@@ -1,9 +1,5 @@
 <div id="schedule_playlist_dialog">
 <input id="schedule_playlist_search" type="text"></input>
-<ul id="schedule_playlist_choice">
-<?php
-		echo $this->partialLoop('schedule/find-playlists-partial.phtml', $this->playlists); 
-?>
-</ul>
-<ul id="schedule_playlist_chosen">No Playlists</ul>
+<ul id="schedule_playlist_choice"></ul>
+<ul id="schedule_playlist_chosen"></ul>
 </div>
diff --git a/application/views/scripts/schedule/scheduled-content.phtml b/application/views/scripts/schedule/scheduled-content.phtml
index 7e82b36ea..910a2ad65 100644
--- a/application/views/scripts/schedule/scheduled-content.phtml
+++ b/application/views/scripts/schedule/scheduled-content.phtml
@@ -20,5 +20,7 @@
 		</div>
 	</li>
 	<?php endforeach; ?>
+<?php else : ?>
+<li>No Playlists</li>
 <?php endif; ?>
 
diff --git a/public/js/airtime/schedule/schedule.js b/public/js/airtime/schedule/schedule.js
index 6531abe89..5a1b8b713 100644
--- a/public/js/airtime/schedule/schedule.js
+++ b/public/js/airtime/schedule/schedule.js
@@ -159,7 +159,7 @@ function openShowDialog() {
 	});
 }
 
-function makeScheduleDialog(dialog, show) {
+function makeScheduleDialog(dialog, json, show) {
 	
 	dialog.find("#schedule_playlist_search").keyup(function(){
 		var url, string, day;
@@ -172,20 +172,29 @@ function makeScheduleDialog(dialog, show) {
 			
 			$("#schedule_playlist_choice")
 				.empty()
-				.append(html);
+				.append(html)
+				.find('li')
+					.draggable({ 
+						helper: 'clone' 
+					});
 			
 		});
 	});
 
-	dialog.find('#schedule_playlist_choice li')
-		.draggable({ 
-			helper: 'clone' 
-		});
+	dialog.find('#schedule_playlist_choice')
+		.append(json.choice)
+		.find('li')
+			.draggable({ 
+				helper: 'clone' 
+			});
 
 	dialog.find("#schedule_playlist_chosen")
+		.append(json.chosen)
 		.droppable({
       		drop: function(event, ui) {
-				var li, pl_id, url, start_date, end_date, day;
+				var li, pl_id, url, start_date, end_date, day, search;
+
+				search = $("#schedule_playlist_search").val();
 
 				pl_id = $(ui.helper).attr("id").split("_").pop();
 				day = show.start.getDay();
@@ -196,7 +205,7 @@ function makeScheduleDialog(dialog, show) {
 				url = '/Schedule/schedule-show/format/json';
 
 				$.post(url, 
-					{plId: pl_id, start: start_date, end: end_date, showId: show.id, day: day},
+					{plId: pl_id, start: start_date, end: end_date, showId: show.id, day: day, search: search},
 					function(json){
 						var x;
 
@@ -231,7 +240,7 @@ function openScheduleDialog(show) {
 		function(json){
 			var dialog = $(json.dialog);
 
-			makeScheduleDialog(dialog, show);
+			makeScheduleDialog(dialog, json, show);
 
 			dialog.dialog({
 				autoOpen: false,