diff --git a/app/controllers/concerns/has_filters.rb b/app/controllers/concerns/has_filters.rb
index ea5397183..d12058fc4 100644
--- a/app/controllers/concerns/has_filters.rb
+++ b/app/controllers/concerns/has_filters.rb
@@ -1,5 +1,10 @@
 module HasFilters
   extend ActiveSupport::Concern
+  attr_reader :valid_filters, :current_filter
+
+  included do
+    helper_method :valid_filters, :current_filter
+  end
 
   class_methods do
     def has_filters(valid_filters, *args)
diff --git a/app/views/shared/_filter_subnav.html.erb b/app/views/shared/_filter_subnav.html.erb
index 66d5ac273..fc4c5a950 100644
--- a/app/views/shared/_filter_subnav.html.erb
+++ b/app/views/shared/_filter_subnav.html.erb
@@ -1,8 +1,8 @@
 <ul class="menu simple clear" id="filter-subnav">
   <li class="show-for-sr"><%= t("#{i18n_namespace}.filter") %>: </li>
 
-  <% @valid_filters.each do |filter| %>
-    <% if @current_filter == filter %>
+  <% valid_filters.each do |filter| %>
+    <% if current_filter == filter %>
       <li class="is-active"><h2><%= t("#{i18n_namespace}.filters.#{filter}") %></h2></li>
     <% else %>
       <li><%= link_to t("#{i18n_namespace}.filters.#{filter}"),