diff --git a/templates/unread.tpl b/templates/unread.tpl
index a7462ca..b22d4be 100644
--- a/templates/unread.tpl
+++ b/templates/unread.tpl
@@ -34,15 +34,28 @@
 				</button>
 				<ul class="dropdown-menu" role="menu">
 					<li role="presentation" class="category">
-						<a role="menu-item" href="{config.relative_path}/unread"><i class="fa fa-fw <!-- IF !selectedCategory -->fa-check<!-- ENDIF !selectedCategory -->"></i> [[unread:all_categories]]</a>
+						<a role="menu-item" href="{config.relative_path}/{selectedFilter.url}"><i class="fa fa-fw <!-- IF !selectedCategory -->fa-check<!-- ENDIF !selectedCategory -->"></i> [[unread:all_categories]]</a>
 					</li>
 					<!-- BEGIN categories -->
 					<li role="presentation" class="category" data-cid="{categories.cid}">
-						<a role="menu-item" href="{config.relative_path}/unread?cid={categories.cid}"><i class="fa fa-fw <!-- IF categories.selected -->fa-check<!-- ENDIF categories.selected -->"></i><!-- IF categories.icon --><i class="fa fa-fw {categories.icon}"></i><!-- ENDIF categories.icon --> {categories.name}</a>
+						<a role="menu-item" href="{config.relative_path}/{selectedFilter.url}?cid={categories.cid}"><i class="fa fa-fw <!-- IF categories.selected -->fa-check<!-- ENDIF categories.selected -->"></i><!-- IF categories.icon --><i class="fa fa-fw {categories.icon}"></i><!-- ENDIF categories.icon --> {categories.name}</a>
 					</li>
 					<!-- END categories -->
 				</ul>
 			</div>
+
+			<div class="btn-group pull-right">
+				<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+				{selectedFilter.name} <span class="caret"></span>
+				</button>
+				<ul class="dropdown-menu" role="menu">
+					<!-- BEGIN filters -->
+					<li role="presentation" class="category">
+						<a role="menu-item" href="{config.relative_path}/{filters.url}"><i class="fa fa-fw <!-- IF filters.selected -->fa-check<!-- ENDIF filters.selected -->"></i>{filters.name}</a>
+					</li>
+					<!-- END filters -->
+				</ul>
+			</div>
 		</div>
 	</div>
 
@@ -51,7 +64,7 @@
 	<div class="category">
 		<div id="category-no-topics" class="alert alert-warning <!-- IF topics.length -->hidden<!-- ENDIF topics.length -->">[[unread:no_unread_topics]]</div>
 
-		<a href="{config.relative_path}/unread">
+		<a href="{config.relative_path}/{selectedFilter.url}">
 			<div class="alert alert-warning hide" id="new-topics-alert"></div>
 		</a>