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 4be63d7c9..70c215b86 100644
--- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
+++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
@@ -255,7 +255,10 @@ var AIRTIME = (function(AIRTIME) {
         var $toolbar = $(".lib-content .fg-toolbar:first");
 
         mod.createToolbarButtons();
-        mod.moveSearchBarToHeader();
+        //mod.moveSearchBarToHeader();
+        $("#advanced_search").click(function(e) {
+            e.stopPropagation();
+        });
 
         if (localStorage.getItem('user-type') != 'G') {
             $toolbar.append($menu);
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index b79ebbdd0..cfab42097 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -214,13 +214,6 @@ var AIRTIME = (function(AIRTIME) {
             );
     };
 
-    mod.moveSearchBarToHeader = function() {
-        $("#library_display_filter").appendTo("#library_content > .panel-header");
-        $("#advanced_search").click(function(e) {
-            e.stopPropagation();
-        });
-    };
-
     mod.createToolbarDropDown = function() {
         $('#sb-select-page').click(function(){mod.selectCurrentPage();});
         $('#sb-dselect-page').click(function(){mod.deselectCurrentPage();});
@@ -491,18 +484,6 @@ var AIRTIME = (function(AIRTIME) {
             }
 
             AIRTIME.library.fnDeleteItems(aMedia);
-
-            // close the object (playlist/block/webstream)
-            // on the right side if it was just deleted
-            // from the library
-
-            //if (closeObj) {
-            //    $.post(baseUrl+"playlist/close-playlist",
-            //        {"format": "json", "type": currentObjType},
-            //        function(json) {
-            //            $("#editor_pane_wrapper").empty().append(json.html);
-            //        });
-            //}
         }
     };
 
@@ -731,7 +712,7 @@ var AIRTIME = (function(AIRTIME) {
 
             "oColVis": {
                 "sAlign": "right",
-                "aiExclude": [0, 1, 2, 31],
+                "aiExclude": [0, 1, 2, 32],
                 "sSize": "css",
                 "fnStateChange": setFilterElement,
                 "buttonText": $.i18n._("Columns"),
diff --git a/python_apps/airtime_analyzer/airtime_analyzer/metadata_analyzer.py b/python_apps/airtime_analyzer/airtime_analyzer/metadata_analyzer.py
index 58fc1d56e..a4c466940 100644
--- a/python_apps/airtime_analyzer/airtime_analyzer/metadata_analyzer.py
+++ b/python_apps/airtime_analyzer/airtime_analyzer/metadata_analyzer.py
@@ -100,9 +100,10 @@ class MetadataAnalyzer(Analyzer):
             track_number_tokens = track_number 
             if u'/' in track_number:
                 track_number_tokens = track_number.split(u'/')
+                track_number = track_number_tokens[0]
             elif u'-' in track_number:
                 track_number_tokens = track_number.split(u'-')
-            track_number = track_number_tokens[0]
+                track_number = track_number_tokens[0]
             metadata["track_number"] = track_number
             track_total = track_number_tokens[1]
             metadata["track_total"] = track_total