diff --git a/app/components/orangelight/advanced_search_form_component.html.erb b/app/components/orangelight/advanced_search_form_component.html.erb
index b593d3c42..e50175252 100644
--- a/app/components/orangelight/advanced_search_form_component.html.erb
+++ b/app/components/orangelight/advanced_search_form_component.html.erb
@@ -15,10 +15,7 @@
         <div class="input-criteria">
 
           <div id="guided_search">
-            <%= render 'advanced/guided_search_fields' %>
-            <%# search_field_controls.each do |control| %>
-              <%# control %>
-            <%# end %>
+            <%= render 'advanced/guided_search_fields_bl_8' %>
           </div>
         </div>
       <%# End Column 1 %>
@@ -41,9 +38,9 @@
         <div class="form-group advanced-search-facet row">
           <%= label_tag pub_date_field.parameterize, :class => "col-sm-4 control-label advanced-facet-label" do %>Publication Year<% end %>
           <div class="col-sm-8 range_limit">
-            <label for="range_pub_date_start_sort_begin" class="sr-only">date range (starting year)</label>
+            <label for="range_pub_date_start_sort_begin" class="sr-only">Publication date range (starting year)</label>
             <%= BlacklightRangeLimit::RangeFormComponent.new(facet_field: pub_date_presenter).render_range_input(:begin) %> –
-            <label for="range_pub_date_start_sort_end" class="sr-only">date range (ending year)</label>
+            <label for="range_pub_date_start_sort_end" class="sr-only">Publication date range (ending year)</label>
             <%= BlacklightRangeLimit::RangeFormComponent.new(facet_field: pub_date_presenter).render_range_input(:end) %>
           </div>
         </div>
diff --git a/app/views/advanced/_guided_search_fields_bl_8.html.erb b/app/views/advanced/_guided_search_fields_bl_8.html.erb
new file mode 100644
index 000000000..ef2272d8c
--- /dev/null
+++ b/app/views/advanced/_guided_search_fields_bl_8.html.erb
@@ -0,0 +1,74 @@
+<div class="advanced-search-field">
+  <div class="search-field">
+    <label for="clause_0_field" class="sr-only">Options for advanced search</label>
+    <%= select_tag(
+          'clause[0][field]',
+          options_for_select(
+            advanced_key_value,
+            guided_field(:clause_0_field, 'all_fields')
+          ),
+          class: "search_field") %>
+    <div name="row1">
+      <label for='clause_0_query' class='sr-only'>Advanced search terms</label>
+      <%= text_field_tag(
+            "clause[0][query]",
+            label_tag_default_for(:clause_0_query),
+            class: 'form-control',
+            autocorrect: "off",
+            autocapitalize: "off",
+            autocomplete: "off",
+            spellcheck: "false") %>
+    </div>
+  </div>
+  <div class="search-operators" role="radiogroup" aria-label="Search operators">
+    <label><%= radio_button_tag("op2", "AND", guided_radio(:op2, "AND")) %> AND</label>
+    <label><%= radio_button_tag("op2", "OR", guided_radio(:op2, "OR")) %> OR</label>
+    <label><%= radio_button_tag("op2", "NOT", guided_radio(:op2, "NOT")) %> NOT</label>
+  </div>
+  <div class="search-field">
+    <label for="clause_1_field" class="sr-only">Options for advanced search - second parameter</label>
+    <%= select_tag(
+          'clause[1][field]', 
+          options_for_select(
+            advanced_key_value,
+            guided_field(:clause_1_field, 'author')
+          ), 
+          class: "search_field") %>
+    <div name="row2">
+      <label for='clause_1_query' class='sr-only'>Advanced search terms - second parameter</label>
+      <%= text_field_tag(
+            "clause[1][query]", 
+            label_tag_default_for(:clause_1_query), 
+            class: 'form-control', 
+            autocorrect: "off", 
+            autocapitalize: "off", 
+            autocomplete: "off", 
+            spellcheck: "false") %>
+    </div>
+  </div>
+  <div class="search-operators" role="radiogroup" aria-label="Search operators">
+    <label><%= radio_button_tag("op3", "AND", guided_radio(:op3, "AND")) %> AND</label>
+    <label><%= radio_button_tag("op3", "OR", guided_radio(:op3, "OR")) %> OR</label>
+    <label><%= radio_button_tag("op3", "NOT", guided_radio(:op3, "NOT")) %> NOT</label>
+  </div>
+  <div class="search-field">
+    <label for="clause_2_field" class="sr-only">Options for advanced search - third parameter</label>
+    <%= select_tag(
+          'clause[2][field]', 
+          options_for_select(
+            advanced_key_value, 
+            guided_field(:clause_2_field, 'title')
+          ),
+          class: "search_field") %>
+    <div name="row3">
+      <label for='clause_2_query' class='sr-only'>Advanced search terms - third parameter</label>
+      <%= text_field_tag(
+            "clause[2][query]", 
+            label_tag_default_for(:clause_2_query), 
+            :class => 'form-control', 
+            autocorrect: "off", 
+            autocapitalize: "off", 
+            spellcheck: "false") %>
+    </div>
+  </div>
+</div>
diff --git a/spec/components/orangelight/advanced_search_form_component_spec.rb b/spec/components/orangelight/advanced_search_form_component_spec.rb
index ff8fae31f..6893f14ff 100644
--- a/spec/components/orangelight/advanced_search_form_component_spec.rb
+++ b/spec/components/orangelight/advanced_search_form_component_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-RSpec.describe Orangelight::AdvancedSearchFormComponent, type: :component do
+RSpec.describe Orangelight::AdvancedSearchFormComponent, type: :component, advanced_search: true do
   subject(:render) do
     component.render_in(view_context)
   end
@@ -43,4 +43,11 @@
     options = rendered.all('select')[1].all('option').map(&:text)
     expect(options).to eq(expected_options)
   end
+
+  it 'has text fields for each search field' do
+    expect(rendered).to have_selector '.advanced-search-field', count: 1
+    expect(rendered).to have_field 'clause_0_field', with: 'all_fields'
+    expect(rendered).to have_field 'clause_1_field', with: 'author'
+    expect(rendered).to have_field 'clause_2_field', with: 'title'
+  end
 end
diff --git a/spec/features/advanced_searching_spec.rb b/spec/features/advanced_searching_spec.rb
index f12dbd04a..5d01331b1 100644
--- a/spec/features/advanced_searching_spec.rb
+++ b/spec/features/advanced_searching_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'advanced searching' do
+describe 'advanced searching', advanced_search: true do
   before do
     stub_holding_locations
   end