diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index 772327582..c9c1f17a3 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -27,20 +27,26 @@ class Application_Model_Preference
         if($isUserValue) {
         	$sql .= " AND subjid = '$id'";
         }
-
+		
         $result = $con->query($sql)->fetchColumn(0);
 
+        if($value == "") {
+            $value = "NULL";
+        }else {
+            $value = "'$value'";
+        }
+        
         if($result == 1) {
         	// result found
 	        if(is_null($id) || !$isUserValue) {
 	        	// system pref
 	            $sql = "UPDATE cc_pref"
-	            ." SET subjid = NULL, valstr = '$value'"
+	            ." SET subjid = NULL, valstr = $value"
 	            ." WHERE keystr = '$key'";
 	        } else {
 	        	// user pref
 	            $sql = "UPDATE cc_pref"
-	            . " SET valstr = '$value'"
+	            . " SET valstr = $value"
 	            . " WHERE keystr = '$key' AND subjid = $id";
 	        }
         } else {
@@ -48,14 +54,13 @@ class Application_Model_Preference
 	        if(is_null($id) || !$isUserValue) {
 	        	// system pref
 	            $sql = "INSERT INTO cc_pref (keystr, valstr)"
-	            ." VALUES ('$key', '$value')";
+	            ." VALUES ('$key', $value)";
 	        } else {
 	        	// user pref
 	            $sql = "INSERT INTO cc_pref (subjid, keystr, valstr)"
-	            ." VALUES ($id, '$key', '$value')";
+	            ." VALUES ($id, '$key', $value)";
 	        }
         }
-
         return $con->exec($sql);
     }
 
diff --git a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
index fd0f4aebf..4126852a9 100644
--- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
+++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
@@ -9,11 +9,11 @@ var AIRTIME = (function(AIRTIME){
 	
 	mod.checkAddButton = function() {
 		var selected = mod.getChosenItemsLength(),
-    		cursor = $('tr.cursor-selected-row'),
+    		$cursor = $('tr.cursor-selected-row'),
     		check = false;
     	
     	//make sure library items are selected and a cursor is selected.
-    	if (selected !== 0 && cursor.length !== 0) {
+    	if (selected !== 0 && $cursor.length !== 0) {
     		check = true;
     	}
     	
@@ -100,7 +100,8 @@ var AIRTIME = (function(AIRTIME){
 					length,
 					temp,
 					aMediaIds = [],
-					aSchedIds = [];
+					aSchedIds = [],
+					aData = [];
 				
 				//process selected files/playlists.
 				for (i = 0, length = selected.length; i < length; i++) {
@@ -108,7 +109,6 @@ var AIRTIME = (function(AIRTIME){
 					aMediaIds.push({"id": data.id, "type": data.ftype});	
 				}
 				
-				aData = [];
 				$("#show_builder_table tr.cursor-selected-row").each(function(i, el){
 					aData.push($(el).prev().data("aData"));
 				});
diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index c8795bd40..4582d4466 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -5,6 +5,7 @@ var AIRTIME = (function(AIRTIME){
 		$sbContent,
 		$sbTable,
 		$toolbar,
+		$ul,
 		$lib;
 	
 	if (AIRTIME.showbuilder === undefined) {
@@ -56,7 +57,7 @@ var AIRTIME = (function(AIRTIME){
 	};
 	
 	mod.checkTrimButton = function() {
-		$over = $sbTable.find(".sb-over");
+		var $over = $sbTable.find(".sb-over");
 		
 		if ($over.length !== 0) {
 			AIRTIME.button.enableButton("sb-button-trim");
@@ -67,7 +68,7 @@ var AIRTIME = (function(AIRTIME){
 	};
 	
 	mod.checkDeleteButton = function() {
-		$selected = $sbTable.find("tbody").find("input:checkbox").filter(":checked");
+		var $selected = $sbTable.find("tbody").find("input:checkbox").filter(":checked");
 		
 		if ($selected.length !== 0) {
 			AIRTIME.button.enableButton("sb-button-delete");
@@ -78,7 +79,7 @@ var AIRTIME = (function(AIRTIME){
 	};
 	
 	mod.checkJumpToCurrentButton = function() {
-		$current = $sbTable.find(".sb-now-playing");
+		var $current = $sbTable.find(".sb-now-playing");
 		
 		if ($current.length !== 0) {
 			AIRTIME.button.enableButton("sb-button-current");
@@ -89,7 +90,7 @@ var AIRTIME = (function(AIRTIME){
 	};
 	
 	mod.checkCancelButton = function() {
-		$current = $sbTable.find(".sb-current-show");
+		var $current = $sbTable.find(".sb-current-show");
 		
 		if ($current.length !== 0) {
 			AIRTIME.button.enableButton("sb-button-cancel");
@@ -784,6 +785,7 @@ var AIRTIME = (function(AIRTIME){
 		$ul.append('<li class="ui-state-default ui-state-disabled sb-button-current" title="Jump to the currently playing track"><span class="ui-icon ui-icon-arrowstop-1-s"></span></li>')
 			.append('<li class="ui-state-default ui-state-disabled sb-button-cancel" title="Cancel current show"><span class="ui-icon ui-icon-eject"></span></li>');
 		$toolbar.append($ul);
+		$ul = undefined;
 		
 		$.contextMenu({
             selector: '#show_builder .ui-icon-document-b',