diff --git a/dashboard-ui/games.html b/dashboard-ui/games.html
index 9986985f7d..166d91c72d 100644
--- a/dashboard-ui/games.html
+++ b/dashboard-ui/games.html
@@ -17,12 +17,12 @@
             </div>
             <div class="viewSettings">
                 <div class="viewControls">
-	                <div style="display: inline-block;">
-		                <select data-mini="true" data-inline="true" id="selectView" name="selectView">
-			                <option value="Backdrop">Backdrop</option>
-			                <option value="Poster">Poster</option>
-		                </select>
-	                </div>
+                    <div style="display: inline-block;">
+                        <select data-mini="true" data-inline="true" id="selectView" name="selectView">
+                            <option value="Backdrop">Backdrop</option>
+                            <option value="Poster">Poster</option>
+                        </select>
+                    </div>
                     <button data-mini="true" data-icon="sort" data-inline="true" onclick="$('#sortPanel', $.mobile.activePage).panel( 'toggle' );">Sort</button>
                     <button data-mini="true" data-icon="filter" data-inline="true" onclick="$('#filterPanel', $.mobile.activePage).panel( 'toggle' );">Filter</button>
                 </div>
@@ -30,7 +30,7 @@
                 </div>
             </div>
 
-	        <div id="items" class="itemsContainer"></div>
+            <div id="items" class="itemsContainer"></div>
 
         </div>
         <div data-role="panel" id="sortPanel" data-position="right" data-display="overlay" data-theme="b" data-position-fixed="true">
@@ -94,11 +94,21 @@
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-theme="c" data-filter="Dislikes" data-mini="true">
                     <label for="chkDislikes">Dislikes</label>
                 </fieldset>
+
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Game System:</strong>
+                        <strong>Features:</strong>
                     </legend>
 
+                    <input class="chkFeatureFilter" type="checkbox" data-theme="c" name="chkTrailer" id="chkTrailer" data-mini="true">
+                    <label for="chkTrailer">Trailer</label>
+
+                    <input class="chkFeatureFilter" type="checkbox" data-theme="c" name="chkThemeSong" id="chkThemeSong" data-mini="true">
+                    <label for="chkThemeSong">Theme song</label>
+
+                    <input class="chkFeatureFilter" type="checkbox" data-theme="c" name="chkThemeVideo" id="chkThemeVideo" data-mini="true">
+                    <label for="chkThemeVideo">Theme video</label>
+
                 </fieldset>
             </form>
         </div>
diff --git a/dashboard-ui/scripts/gamespage.js b/dashboard-ui/scripts/gamespage.js
index bfbdc2d7f4..fe5818e6c8 100644
--- a/dashboard-ui/scripts/gamespage.js
+++ b/dashboard-ui/scripts/gamespage.js
@@ -3,146 +3,172 @@
 
     var view = "Poster";
 
-	// The base query options
-	var query = {
+    // The base query options
+    var query = {
 
-		SortBy: "SortName",
-		SortOrder: "Ascending",
-		MediaTypes: "Game",
-		Recursive: true,
-		Fields: "UserData,DisplayMediaType,Genres,Studios",
-		Limit: LibraryBrowser.getDetaultPageSize(),
-		StartIndex: 0
-	};
+        SortBy: "SortName",
+        SortOrder: "Ascending",
+        MediaTypes: "Game",
+        Recursive: true,
+        Fields: "UserData,DisplayMediaType,Genres,Studios",
+        Limit: LibraryBrowser.getDetaultPageSize(),
+        StartIndex: 0
+    };
 
-	function reloadItems(page) {
+    function reloadItems(page) {
 
-		Dashboard.showLoadingMsg();
+        Dashboard.showLoadingMsg();
 
-		ApiClient.getItems(Dashboard.getCurrentUserId(), query).done(function (result) {
+        ApiClient.getItems(Dashboard.getCurrentUserId(), query).done(function (result) {
 
-			var html = '';
+            var html = '';
 
-			$('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create');
+            $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create');
 
-			if (view == "Backdrop") {
-				html += LibraryBrowser.getPosterDetailViewHtml({
-					items: result.Items,
-					preferBackdrop: true,
-					context: "games",
-					shape: "backdrop"
-				});
-			}
-			else if (view == "Poster") {
-				html += LibraryBrowser.getPosterDetailViewHtml({
-					items: result.Items,
-					context: "games",
-					shape: "poster"
-				});
-			}
+            if (view == "Backdrop") {
+                html += LibraryBrowser.getPosterDetailViewHtml({
+                    items: result.Items,
+                    preferBackdrop: true,
+                    context: "games",
+                    shape: "backdrop"
+                });
+            }
+            else if (view == "Poster") {
+                html += LibraryBrowser.getPosterDetailViewHtml({
+                    items: result.Items,
+                    context: "games",
+                    shape: "poster"
+                });
+            }
 
-			html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
+            html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
 
-			$('#items', page).html(html).trigger('create');
+            $('#items', page).html(html).trigger('create');
 
-			$('.selectPage', page).on('change', function () {
-			    query.StartIndex = (parseInt(this.value) - 1) * query.Limit;
-				reloadItems(page);
-			});
+            $('.selectPage', page).on('change', function () {
+                query.StartIndex = (parseInt(this.value) - 1) * query.Limit;
+                reloadItems(page);
+            });
 
-			$('.btnNextPage', page).on('click', function () {
-			    query.StartIndex += query.Limit;
-			    reloadItems(page);
-			});
+            $('.btnNextPage', page).on('click', function () {
+                query.StartIndex += query.Limit;
+                reloadItems(page);
+            });
 
-			$('.btnPreviousPage', page).on('click', function () {
-			    query.StartIndex -= query.Limit;
-			    reloadItems(page);
-			});
+            $('.btnPreviousPage', page).on('click', function () {
+                query.StartIndex -= query.Limit;
+                reloadItems(page);
+            });
 
-			$('.selectPageSize', page).on('change', function () {
-			    query.Limit = parseInt(this.value);
-			    query.StartIndex = 0;
-			    reloadItems(page);
-			});
+            $('.selectPageSize', page).on('change', function () {
+                query.Limit = parseInt(this.value);
+                query.StartIndex = 0;
+                reloadItems(page);
+            });
 
-			Dashboard.hideLoadingMsg();
-		});
-	}
+            Dashboard.hideLoadingMsg();
+        });
+    }
 
-	$(document).on('pageinit', "#gamesPage", function () {
+    $(document).on('pageinit', "#gamesPage", function () {
 
-		var page = this;
+        var page = this;
 
-		$('.radioSortBy', this).on('click', function () {
-			query.StartIndex = 0;
-			query.SortBy = this.getAttribute('data-sortby');
-			reloadItems(page);
-		});
+        $('.radioSortBy', this).on('click', function () {
+            query.StartIndex = 0;
+            query.SortBy = this.getAttribute('data-sortby');
+            reloadItems(page);
+        });
 
-		$('.radioSortOrder', this).on('click', function () {
-			query.StartIndex = 0;
-			query.SortOrder = this.getAttribute('data-sortorder');
-			reloadItems(page);
-		});
+        $('.radioSortOrder', this).on('click', function () {
+            query.StartIndex = 0;
+            query.SortOrder = this.getAttribute('data-sortorder');
+            reloadItems(page);
+        });
 
-		$('.chkStandardFilter', this).on('change', function () {
+        $('.chkStandardFilter', this).on('change', function () {
 
-			var filterName = this.getAttribute('data-filter');
-			var filters = query.Filters || "";
+            var filterName = this.getAttribute('data-filter');
+            var filters = query.Filters || "";
 
-			filters = (',' + filters).replace(',' + filterName, '').substring(1);
+            filters = (',' + filters).replace(',' + filterName, '').substring(1);
 
-			if (this.checked) {
-				filters = filters ? (filters + ',' + filterName) : filterName;
-			}
+            if (this.checked) {
+                filters = filters ? (filters + ',' + filterName) : filterName;
+            }
 
-			query.StartIndex = 0;
-			query.Filters = filters;
+            query.StartIndex = 0;
+            query.Filters = filters;
 
-			reloadItems(page);
-		});
+            reloadItems(page);
+        });
 
-		$('#selectView', this).on('change', function () {
+        $('#selectView', this).on('change', function () {
 
-			view = this.value;
+            view = this.value;
 
-			reloadItems(page);
-		});
+            reloadItems(page);
+        });
+
+        $('#chkTrailer', this).on('change', function () {
+
+            query.StartIndex = 0;
+            query.HasTrailer = this.checked ? true : null;
+
+            reloadItems(page);
+        });
+
+        $('#chkThemeSong', this).on('change', function () {
+
+            query.StartIndex = 0;
+            query.HasThemeSong = this.checked ? true : null;
+
+            reloadItems(page);
+        });
+
+        $('#chkThemeVideo', this).on('change', function () {
+
+            query.StartIndex = 0;
+            query.HasThemeVideo = this.checked ? true : null;
+
+            reloadItems(page);
+        });
+
+    }).on('pagebeforeshow', "#gamesPage", function () {
+
+        reloadItems(this);
+
+    }).on('pageshow', "#gamesPage", function () {
 
 
-	}).on('pagebeforeshow', "#gamesPage", function () {
+        // Reset form values using the last used query
+        $('.radioSortBy', this).each(function () {
 
-			reloadItems(this);
+            this.checked = query.SortBy == this.getAttribute('data-sortby');
 
-		}).on('pageshow', "#gamesPage", function () {
+        }).checkboxradio('refresh');
+
+        $('.radioSortOrder', this).each(function () {
+
+            this.checked = query.SortOrder == this.getAttribute('data-sortorder');
+
+        }).checkboxradio('refresh');
+
+        $('.chkStandardFilter', this).each(function () {
+
+            var filters = "," + (query.Filters || "");
+            var filterName = this.getAttribute('data-filter');
+
+            this.checked = filters.indexOf(',' + filterName) != -1;
+
+        }).checkboxradio('refresh');
 
 
-			// Reset form values using the last used query
-			$('.radioSortBy', this).each(function () {
+        $('#selectView', this).val(view).selectmenu('refresh');
 
-				this.checked = query.SortBy == this.getAttribute('data-sortby');
-
-			}).checkboxradio('refresh');
-
-			$('.radioSortOrder', this).each(function () {
-
-				this.checked = query.SortOrder == this.getAttribute('data-sortorder');
-
-			}).checkboxradio('refresh');
-
-			$('.chkStandardFilter', this).each(function () {
-
-				var filters = "," + (query.Filters || "");
-				var filterName = this.getAttribute('data-filter');
-
-				this.checked = filters.indexOf(',' + filterName) != -1;
-
-			}).checkboxradio('refresh');
-
-
-			$('#selectView', this).val(view).selectmenu('refresh');
-
-		});
+        $('#chkTrailer', this).checked(query.HasTrailer == true).checkboxradio('refresh');
+        $('#chkThemeSong', this).checked(query.HasThemeSong == true).checkboxradio('refresh');
+        $('#chkThemeVideo', this).checked(query.HasThemeVideo == true).checkboxradio('refresh');
+    });
 
 })(jQuery, document);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js
index 056adf6dc1..bd32584954 100644
--- a/dashboard-ui/scripts/tvshows.js
+++ b/dashboard-ui/scripts/tvshows.js
@@ -138,6 +138,30 @@
             reloadItems(page);
         });
 
+        $('#chkTrailer', this).on('change', function () {
+
+            query.StartIndex = 0;
+            query.HasTrailer = this.checked ? true : null;
+
+            reloadItems(page);
+        });
+
+        $('#chkThemeSong', this).on('change', function () {
+
+            query.StartIndex = 0;
+            query.HasThemeSong = this.checked ? true : null;
+
+            reloadItems(page);
+        });
+
+        $('#chkThemeVideo', this).on('change', function () {
+
+            query.StartIndex = 0;
+            query.HasThemeVideo = this.checked ? true : null;
+
+            reloadItems(page);
+        });
+
     }).on('pagebeforeshow', "#tvShowsPage", function () {
 
         reloadItems(this);
@@ -185,6 +209,10 @@
         }).checkboxradio('refresh');
 
         $('#selectView', this).val(view).selectmenu('refresh');
+
+        $('#chkTrailer', this).checked(query.HasTrailer == true).checkboxradio('refresh');
+        $('#chkThemeSong', this).checked(query.HasThemeSong == true).checkboxradio('refresh');
+        $('#chkThemeVideo', this).checked(query.HasThemeVideo == true).checkboxradio('refresh');
     });
 
 })(jQuery, document);
\ No newline at end of file
diff --git a/dashboard-ui/tvshows.html b/dashboard-ui/tvshows.html
index 61948e9c84..d19e588536 100644
--- a/dashboard-ui/tvshows.html
+++ b/dashboard-ui/tvshows.html
@@ -113,6 +113,22 @@
                     <input class="chkAirDays" type="checkbox" name="chkSaturday" id="chkSaturday" data-theme="c" data-filter="Saturday" data-mini="true">
                     <label for="chkSaturday">Saturday</label>
                 </fieldset>
+
+                <fieldset data-role="controlgroup">
+                    <legend>
+                        <strong>Features:</strong>
+                    </legend>
+
+                    <input class="chkFeatureFilter" type="checkbox" data-theme="c" name="chkTrailer" id="chkTrailer" data-mini="true">
+                    <label for="chkTrailer">Trailer</label>
+
+                    <input class="chkFeatureFilter" type="checkbox" data-theme="c" name="chkThemeSong" id="chkThemeSong" data-mini="true">
+                    <label for="chkThemeSong">Theme song</label>
+
+                    <input class="chkFeatureFilter" type="checkbox" data-theme="c" name="chkThemeVideo" id="chkThemeVideo" data-mini="true">
+                    <label for="chkThemeVideo">Theme video</label>
+
+                </fieldset>
             </form>
         </div>
     </div>