diff --git a/app/assets/stylesheets/wallaby/base/_functions.scss b/app/assets/stylesheets/wallaby/base/_functions.scss
index 7fdc8928..6bfd2c81 100644
--- a/app/assets/stylesheets/wallaby/base/_functions.scss
+++ b/app/assets/stylesheets/wallaby/base/_functions.scss
@@ -1,3 +1,5 @@
+$fa-class-map: null;
+
 @function fa-content($fa-var) {
   // Make sure FA value is wrapped in quotes
   @return unquote("\"#{ $fa-var }\"");
diff --git a/app/views/wallaby/resources/_index_query.html.erb b/app/views/wallaby/resources/_index_query.html.erb
index 54045878..1c2fa6b8 100644
--- a/app/views/wallaby/resources/_index_query.html.erb
+++ b/app/views/wallaby/resources/_index_query.html.erb
@@ -1,7 +1,7 @@
 <%= content_tag :div, class: request.query_parameters.present? ? %w(query query--filtered) : %w(query) do %>
   <nav class="query__actions">
-    <%= index_link(current_model_class, html_classes('query__clear')) {} if request.query_parameters.present? %>
-    <%= new_link(current_model_class, html_classes('query__create')) {} %>
+    <%= index_link(current_model_class, **html_classes('query__clear')) {} if request.query_parameters.present? %>
+    <%= new_link(current_model_class, **html_classes('query__create')) {} %>
     <a id="actions_list" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" class="query__more"></a>
     <%= render 'index_actions' %>
   </nav>
diff --git a/lib/wallaby/version.rb b/lib/wallaby/version.rb
index 93490318..0f48480e 100644
--- a/lib/wallaby/version.rb
+++ b/lib/wallaby/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wallaby
-  VERSION = '6.1.5' # :nodoc:
+  VERSION = '6.1.6' # :nodoc:
 end