anchor.diff:          <%= pass_through_filter_options_as_hidden_fields(@filter, :type, :state, :world_location, :from_date, :to_date) %>
           <%= submit_tag "Go", class: "btn js-hidden" %>
         <% end %>
  -    </div>
  -  <% end %>
  +    <% end %>
   
  -  <% if filter_by.include?(:world_location) %>
  -    <div class="filter-grouping">
  +    <% if filter_by.include?(:world_location) %>
         <%= form_tag("", method: :get, class: "js-edition-select-filter", id: 'world_location_filter') do %>
  -        <%= label_tag :world_location %>
  +        <% if filter_by.include?(:author) or filter_by.include?(:organisation) %>
  +          <%= label_tag :world_location, 'or world location' %>
  +        <% else %>
  +          <%= label_tag :world_location %>
  +        <% end %>
           <%= select_tag  :world_location,
                           options_for_select(admin_world_location_filter_options(current_user), @filter.options[:world_location]),
                           class: 'chzn-select',
  
positive.code:         <%= pass_through_filter_options_as_hidden_fields(@filter, :type, :state, :world_location, :from_date, :to_date) %>
          <%= submit_tag "Go", class: "btn js-hidden" %>
        <% end %>
  
        <%= form_tag("", method: :get, class: "js-edition-select-filter", id: 'organisation_filter') do %>
          <%= label_tag :organisation, 'or organisation' %>
          <%= select_tag  :organisation,
                          options_for_select(admin_organisation_filter_options(current_user), @filter.options[:organisation]),
                          class: 'chzn-select',
  
negative.code:         <%= pass_through_filter_options_as_hidden_fields(@filter, :type, :state, :author, :from_date, :to_date) %>
          <%= submit_tag "Go", class: "btn js-hidden" %>
        <% end %>
      <% end %>
    </div>
  
    <% if filter_by.include?(:type) %>
      <div class="filter-grouping">
  