diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html
index e6760e3a..42283cf3 100644
--- a/data/interfaces/default/info.html
+++ b/data/interfaces/default/info.html
@@ -617,16 +617,13 @@ DOCUMENTATION :: END
                                             % endif
                                             <div class="btn-group" data-toggle="buttons" id="transcode_decision-selection">
                                                 <label class="btn btn-dark">
-                                                    <input type="radio" name="transcode_decision-filter" id="history-transcode_decision-all" value="all" autocomplete="off"> All
+                                                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-direct_play" value="direct play" autocomplete="off"><i class="fa fa-play-circle"></i> Direct Play
                                                 </label>
                                                 <label class="btn btn-dark">
-                                                    <input type="radio" name="transcode_decision-filter" id="history-transcode_decision-direct_play" value="direct play" autocomplete="off"> Direct Play
+                                                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-direct_stream" value="copy" autocomplete="off"><i class="fa fa-stream"></i> Direct Stream
                                                 </label>
                                                 <label class="btn btn-dark">
-                                                    <input type="radio" name="transcode_decision-filter" id="history-transcode_decision-direct_stream" value="copy" autocomplete="off"> Direct Stream
-                                                </label>
-                                                <label class="btn btn-dark">
-                                                    <input type="radio" name="transcode_decision-filter" id="history-transcode_decision-transcode" value="transcode" autocomplete="off"> Transcode
+                                                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-transcode" value="transcode" autocomplete="off"><i class="fa fa-server"></i> Transcode
                                                 </label>
                                             </div>
                                             <div class="btn-group">
@@ -857,16 +854,18 @@ DOCUMENTATION :: END
             $('#transcode_decision-selection > label').removeClass('active');
             var selected_filter = $('input[name=transcode_decision-filter]:checked', '#transcode_decision-selection');
             $(selected_filter).closest('label').addClass('active');
-            transcode_decision = $(selected_filter).val();
+            transcode_decision = $(selected_filter).map(function () { return $(this).val(); }).get().join(',');
             setLocalStorage('info_${data["rating_key"]}_history_transcode_decision', transcode_decision);
             history_table.draw();
         });
     }
 
     var transcode_decision = getLocalStorage('info_${data["rating_key"]}_history_transcode_decision', 'all');
-    var history_transcode_decision = $('#history-transcode_decision-' + transcode_decision.replace(' ', '_'));
-    history_transcode_decision.prop('checked', true);
-    history_transcode_decision.closest('label').addClass('active');
+    $.each(transcode_decision.split(','), function (i, item) {
+        var history_transcode_decision = $('#history-transcode_decision-' + item.replace(' ', '_'));
+        history_transcode_decision.prop('checked', true);
+        history_transcode_decision.closest('label').addClass('active');
+    });
 
     $(document).ready(function () {
         loadHistoryTable(transcode_decision);
diff --git a/data/interfaces/default/library.html b/data/interfaces/default/library.html
index c0b9958e..3d586102 100644
--- a/data/interfaces/default/library.html
+++ b/data/interfaces/default/library.html
@@ -219,16 +219,13 @@ DOCUMENTATION :: END
                                             % endif
                                             <div class="btn-group" data-toggle="buttons" id="transcode_decision-selection">
                                                 <label class="btn btn-dark">
-                                                    <input type="radio" name="transcode_decision-filter" id="history-transcode_decision-all" value="all" autocomplete="off"> All
+                                                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-direct_play" value="direct play" autocomplete="off"><i class="fa fa-play-circle"></i> Direct Play
                                                 </label>
                                                 <label class="btn btn-dark">
-                                                    <input type="radio" name="transcode_decision-filter" id="history-transcode_decision-direct_play" value="direct play" autocomplete="off"> Direct Play
+                                                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-direct_stream" value="copy" autocomplete="off"><i class="fa fa-stream"></i> Direct Stream
                                                 </label>
                                                 <label class="btn btn-dark">
-                                                    <input type="radio" name="transcode_decision-filter" id="history-transcode_decision-direct_stream" value="copy" autocomplete="off"> Direct Stream
-                                                </label>
-                                                <label class="btn btn-dark">
-                                                    <input type="radio" name="transcode_decision-filter" id="history-transcode_decision-transcode" value="transcode" autocomplete="off"> Transcode
+                                                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-transcode" value="transcode" autocomplete="off"><i class="fa fa-server"></i> Transcode
                                                 </label>
                                             </div>
                                             <div class="btn-group">
@@ -596,7 +593,7 @@ DOCUMENTATION :: END
             $('#transcode_decision-selection > label').removeClass('active');
             var selected_filter = $('input[name=transcode_decision-filter]:checked', '#transcode_decision-selection');
             $(selected_filter).closest('label').addClass('active');
-            transcode_decision = $(selected_filter).val();
+            transcode_decision = $(selected_filter).map(function () { return $(this).val(); }).get().join(',');
             setLocalStorage('library_' + section_id + 'history_transcode_decision', transcode_decision);
             history_table.draw();
         });
@@ -605,9 +602,11 @@ DOCUMENTATION :: END
     $('#nav-tabs-history').on('shown.bs.tab', function() {
         if (typeof(history_table) === 'undefined') {
             var transcode_decision = getLocalStorage('library_' + section_id + 'history_transcode_decision', 'all');
-            var history_transcode_decision = $('#history-transcode_decision-' + transcode_decision.replace(' ', '_'));
-            history_transcode_decision.prop('checked', true);
-            history_transcode_decision.closest('label').addClass('active');
+            $.each(transcode_decision.split(','), function (i, item) {
+                var history_transcode_decision = $('#history-transcode_decision-' + item.replace(' ', '_'));
+                history_transcode_decision.prop('checked', true);
+                history_transcode_decision.closest('label').addClass('active');
+            });
 
             loadHistoryTable(transcode_decision);
         }
diff --git a/data/interfaces/default/user.html b/data/interfaces/default/user.html
index 29d4a753..08837f6e 100644
--- a/data/interfaces/default/user.html
+++ b/data/interfaces/default/user.html
@@ -169,33 +169,27 @@ DOCUMENTATION :: END
                                             % endif
                                             <div class="btn-group" data-toggle="buttons" id="media_type-selection">
                                                 <label class="btn btn-dark">
-                                                    <input type="radio" name="media_type-filter" id="history-media_type-all" value="all" autocomplete="off"> All
+                                                    <input type="checkbox" name="media_type-filter" id="history-media_type-movie" value="movie" autocomplete="off"><i class="fa fa-film"></i> Movies
                                                 </label>
                                                 <label class="btn btn-dark">
-                                                    <input type="radio" name="media_type-filter" id="history-media_type-movie" value="movie" autocomplete="off"> Movies
+                                                    <input type="checkbox" name="media_type-filter" id="history-media_type-episode" value="episode" autocomplete="off"><i class="fa fa-television"></i> TV Shows
                                                 </label>
                                                 <label class="btn btn-dark">
-                                                    <input type="radio" name="media_type-filter" id="history-media_type-episode" value="episode" autocomplete="off"> TV Shows
+                                                    <input type="checkbox" name="media_type-filter" id="history-media_type-track" value="track" autocomplete="off"><i class="fa fa-music"></i> Music
                                                 </label>
                                                 <label class="btn btn-dark">
-                                                    <input type="radio" name="media_type-filter" id="history-media_type-track" value="track" autocomplete="off"> Music
-                                                </label>
-                                                <label class="btn btn-dark">
-                                                    <input type="radio" name="media_type-filter" id="history-media_type-live" value="live" autocomplete="off"> Live TV
+                                                    <input type="checkbox" name="media_type-filter" id="history-media_type-live" value="live" autocomplete="off"><i class="fa fa-broadcast-tower"></i> Live TV
                                                 </label>
                                             </div>
                                             <div class="btn-group" data-toggle="buttons" id="transcode_decision-selection">
                                                 <label class="btn btn-dark">
-                                                    <input type="radio" name="transcode_decision-filter" id="history-transcode_decision-all" value="all" autocomplete="off"> All
+                                                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-direct_play" value="direct play" autocomplete="off"><i class="fa fa-play-circle"></i> Direct Play
                                                 </label>
                                                 <label class="btn btn-dark">
-                                                    <input type="radio" name="transcode_decision-filter" id="history-transcode_decision-direct_play" value="direct play" autocomplete="off"> Direct Play
+                                                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-direct_stream" value="copy" autocomplete="off"><i class="fa fa-stream"></i> Direct Stream
                                                 </label>
                                                 <label class="btn btn-dark">
-                                                    <input type="radio" name="transcode_decision-filter" id="history-transcode_decision-direct_stream" value="copy" autocomplete="off"> Direct Stream
-                                                </label>
-                                                <label class="btn btn-dark">
-                                                    <input type="radio" name="transcode_decision-filter" id="history-transcode_decision-transcode" value="transcode" autocomplete="off"> Transcode
+                                                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-transcode" value="transcode" autocomplete="off"><i class="fa fa-server"></i> Transcode
                                                 </label>
                                             </div>
                                             <div class="btn-group">
@@ -565,7 +559,7 @@ DOCUMENTATION :: END
             $('#media_type-selection > label').removeClass('active');
             var selected_filter = $('input[name=media_type-filter]:checked', '#media_type-selection');
             $(selected_filter).closest('label').addClass('active');
-            media_type = $(selected_filter).val();
+            media_type = $(selected_filter).map(function () { return $(this).val(); }).get().join(',');
             setLocalStorage('user_' + user_id + '-history_media_type', media_type);
             history_table.draw();
         });
@@ -574,7 +568,7 @@ DOCUMENTATION :: END
             $('#transcode_decision-selection > label').removeClass('active');
             var selected_filter = $('input[name=transcode_decision-filter]:checked', '#transcode_decision-selection');
             $(selected_filter).closest('label').addClass('active');
-            transcode_decision = $(selected_filter).val();
+            transcode_decision = $(selected_filter).map(function () { return $(this).val(); }).get().join(',');
             setLocalStorage('user_' + user_id + 'history_transcode_decision', transcode_decision);
             history_table.draw();
         });
@@ -583,14 +577,18 @@ DOCUMENTATION :: END
     $('#nav-tabs-history').on('shown.bs.tab', function() {
         if (typeof(history_table) === 'undefined') {
             var media_type = getLocalStorage('user_' + user_id + '-history_media_type', 'all');
-            var history_media_type = $('#history-media_type-' + media_type);
-            history_media_type.prop('checked', true);
-            history_media_type.closest('label').addClass('active');
+            $.each(media_type.split(','), function (i, item) {
+                var history_media_type = $('#history-media_type-' + item);
+                history_media_type.prop('checked', true);
+                history_media_type.closest('label').addClass('active');
+            });
 
             var transcode_decision = getLocalStorage('user_' + user_id + 'history_transcode_decision', 'all');
-            var history_transcode_decision = $('#history-transcode_decision-' + transcode_decision.replace(' ', '_'));
-            history_transcode_decision.prop('checked', true);
-            history_transcode_decision.closest('label').addClass('active');
+            $.each(transcode_decision.split(','), function (i, item) {
+                var history_transcode_decision = $('#history-transcode_decision-' + item.replace(' ', '_'));
+                history_transcode_decision.prop('checked', true);
+                history_transcode_decision.closest('label').addClass('active');
+            });
 
             loadHistoryTable(media_type, transcode_decision);
         }