`solr_field` undefined local variable error, NameError in Catalog#index

[cdmo]

Using the latest commit (9c23f0e9aad6a789ec912336766289927ea0729b) along with Blacklight 7.0.1, I hit this error when attempting to do an advanced search of only choosing one format facet and nothing else. NameError in Catalog#index

To fix this I did the following.

--- a/app/views/blacklight_advanced_search/_facet_limit.html.erb
+++ b/app/views/blacklight_advanced_search/_facet_limit.html.erb
@@ -2,15 +2,15 @@
   <div class="inclusive_or well">
     <h4>Any of:</h4>
     <ul class="list-unstyled facet-values">
-    <% advanced_query.filters[solr_field].each do |value| %>
+      <% advanced_query.filters.each do |solr_field, value| %>
         <li>
-            <span class="selected"><%= h(value) %></span>
-            <%= link_to(remove_advanced_facet_param(solr_field, value, params), :class => "remove") do %>
-                <span class="glyphicon glyphicon-remove"></span><span class="sr-only">[remove]</span>
-            <% end %>
+          <span class="selected"><%= h(value) %></span>
+          <%= link_to(remove_advanced_facet_param(solr_field, value, params), :class => "remove") do %>
+            <span class="glyphicon glyphicon-remove"></span><span class="sr-only">[remove]</span>
+          <% end %>
         </li>
-    <% end %>
+      <% end %>
     </ul>
   </div>

I'll add thought that I just overrode the partial anyway because I thought it looked confusing

<div class="advanced_facet_limit">
  <%= render_facet_limit display_facet, :layout => nil, :partial => advanced_search_facet_partial_name(display_facet) %>
</div>