diff --git a/development.ini b/development.ini
index cb20cc3..bd0108c 100644
--- a/development.ini
+++ b/development.ini
@@ -33,6 +33,11 @@ session.secret = 'Change Me 2'
 session.auto_csrf = true
 static_views.cache_max_age = 0
 
+# custom jinja filters and tests
+jinja2.filters =
+    are_extras_active = ordr2.templates.tests:are_extras_active
+
+
 ###
 # wsgi server configuration
 ###
diff --git a/ordr2/templates/macros.jinja2 b/ordr2/templates/macros.jinja2
index 3c2b5de..1ddf72e 100644
--- a/ordr2/templates/macros.jinja2
+++ b/ordr2/templates/macros.jinja2
@@ -16,16 +16,20 @@
 {%- endmacro %}
 
 
-{% macro filter_box(title, query_key, items) -%}
+{% macro filter_box(title, query_key, items, extras=None) -%}
+    {% if not extras %}
+        {% set extras = dict() %}
+    {% endif %}
+    {% set extras_active = context|are_extras_active(extras) %}
     <div class="well sidebar-nav">
         <ul class="nav nav-list">
 		    <li class="nav-header">{{ title }}</li>
-			<li {% if not context.filters.get(query_key) %}class="active"{% endif %}>
-			    <a href="{{ context.url( (query_key, None), (context.query_key_current_page, 1) ) }}">All</a>
+			<li {% if not context.filters.get(query_key) and extras_active %}class="active"{% endif %}>
+			    <a href="{{ context.url( (query_key, None), (context.query_key_current_page, 1), *extras.items() ) }}">All</a>
             </li>
             {% for filter, display in items %}
-                <li {% if context.filters.get(query_key) == filter %}class="active"{% endif %}>
-                    <a href="{{ context.url( (query_key, filter), (context.query_key_current_page, 1) ) }}">{{ display }}</a>
+                <li {% if context.filters.get(query_key) == filter and extras_active %}class="active"{% endif %}>
+                    <a href="{{ context.url( (query_key, filter), (context.query_key_current_page, 1), *extras.items() ) }}">{{ display }}</a>
                 </li>
             {% endfor %}
         </ul>
diff --git a/ordr2/templates/tests.py b/ordr2/templates/tests.py
new file mode 100644
index 0000000..e353561
--- /dev/null
+++ b/ordr2/templates/tests.py
@@ -0,0 +1,4 @@
+def are_extras_active(context, extras):
+    if extras is None:
+        return True
+    return all(context.filters.get(k) == v for k, v in extras.items())