diff --git a/src/components/AdvancedSearchBuilder.tsx b/src/components/AdvancedSearchBuilder.tsx
index 578e47be3..ac5431b4b 100644
--- a/src/components/AdvancedSearchBuilder.tsx
+++ b/src/components/AdvancedSearchBuilder.tsx
@@ -33,6 +33,12 @@ export const fields = [
   { value: "audience", label: "audience" },
   { value: "author", label: "author" },
   { value: "title", label: "title" },
+  {
+    value: "fiction",
+    label: "fiction",
+    options: ["fiction", "nonfiction"],
+    operators: ["eq"],
+  },
 ];
 
 export const operators = [
diff --git a/src/components/AdvancedSearchFilterInput.tsx b/src/components/AdvancedSearchFilterInput.tsx
index c053e4750..126731a1f 100644
--- a/src/components/AdvancedSearchFilterInput.tsx
+++ b/src/components/AdvancedSearchFilterInput.tsx
@@ -25,6 +25,23 @@ export default function AdvancedSearchFilterInput({
 
   const handleKeyChange = (value) => {
     setFilterKey(value);
+    const selected = fields.find((field) => field.value === value);
+
+    // Set the value to either the first option, or blank.
+    if (selected.options && selected.options.length) {
+      setFilterValue(selected.options[0]);
+    } else {
+      setFilterValue("");
+    }
+
+    // Update operator if the filter doesn't support it.
+    if (
+      selected.operators &&
+      selected.operators.length &&
+      !selected.operators.find((op) => op === filterOp)
+    ) {
+      setFilterOp(selected.operators[0]);
+    }
   };
 
   const handleOpChange = () => {
@@ -64,6 +81,14 @@ export default function AdvancedSearchFilterInput({
   };
 
   const selectedField = fields.find((field) => field.value === filterKey);
+  const selectedFieldOperators = selectedField.operators
+    ? operators.filter((op) => selectedField.operators.includes(op.value))
+    : operators;
+
+  const selectedFieldOptions = selectedField.options ?? [];
+  const selectedFieldElementType = selectedFieldOptions.length
+    ? "select"
+    : "input";
 
   return (
     <form className="advanced-search-filter-input">
@@ -89,8 +114,9 @@ export default function AdvancedSearchFilterInput({
           onChange={handleOpChange}
           ref={opSelect}
           value={filterOp}
+          className="filter-operator"
         >
-          {operators.map(({ value, label }) => (
+          {selectedFieldOperators.map(({ value, label }) => (
             <option
               aria-selected={value === filterOp}
               key={value}
@@ -104,14 +130,23 @@ export default function AdvancedSearchFilterInput({
         <EditableInput
           aria-label="filter value"
           description={selectedField.helpText}
-          elementType="input"
+          elementType={selectedFieldElementType}
           type="text"
           optionalText={false}
           placeholder={selectedField.placeholder}
           ref={valueInput}
           value={filterValue}
           onChange={handleValueChange}
-        />
+          className="filter-value"
+        >
+          {selectedFieldOptions.length === 0
+            ? null
+            : selectedFieldOptions.map((value) => (
+                <option key={value} value={value}>
+                  {value}
+                </option>
+              ))}
+        </EditableInput>
 
         <Button
           className="inverted inline"
diff --git a/src/components/__tests__/AdvancedSearchFilterInput-test.tsx b/src/components/__tests__/AdvancedSearchFilterInput-test.tsx
index 80be87ace..5b66dc645 100644
--- a/src/components/__tests__/AdvancedSearchFilterInput-test.tsx
+++ b/src/components/__tests__/AdvancedSearchFilterInput-test.tsx
@@ -43,12 +43,96 @@ describe("AdvancedSearchFilterInput", () => {
     });
   });
 
+  it("should restrict the operator selection, if the filter requests it", () => {
+    const fictionRadioButton = wrapper.find(
+      'input[type="radio"][value="fiction"]'
+    );
+    fictionRadioButton.getDOMNode().checked = true;
+    fictionRadioButton.simulate("change");
+
+    const options = wrapper.find(".filter-operator select > option");
+    const fictionField = fields.find((element) => {
+      return element.value === "fiction";
+    });
+
+    expect(options).to.have.length(fictionField.operators.length);
+  });
+
+  it("should use the currently selected operator when changing filters", () => {
+    const sourceFilterButton = wrapper.find(
+      'input[type="radio"][value="data_source"]'
+    );
+    const fictionFilterButton = wrapper.find(
+      'input[type="radio"][value="fiction"]'
+    );
+    const fictionField = fields.find((element) => {
+      return element.value === "fiction";
+    });
+
+    const operatorOptions = wrapper.find(".filter-operator select");
+    operatorOptions.getDOMNode().value = "regex";
+    operatorOptions.simulate("change");
+
+    sourceFilterButton.getDOMNode().checked = true;
+    sourceFilterButton.simulate("change");
+
+    expect(operatorOptions.getDOMNode().value).to.equal("regex");
+
+    // unless the operator is not supported by the filter.
+    fictionFilterButton.getDOMNode().checked = true;
+    fictionFilterButton.simulate("change");
+
+    expect(operatorOptions.getDOMNode().value).to.equal(
+      fictionField.operators[0]
+    );
+
+    // the new operator will be persisted when changing back to source filter
+    sourceFilterButton.getDOMNode().checked = true;
+    sourceFilterButton.simulate("change");
+
+    expect(operatorOptions.getDOMNode().value).to.equal(
+      fictionField.operators[0]
+    );
+  });
+
   it("should render a text input for value entry", () => {
-    const valueInput = wrapper.find('input[type="text"]');
+    const valueSelect = wrapper.find(".filter-value select");
+    const valueInput = wrapper.find('.filter-value input[type="text"]');
 
+    expect(valueSelect).to.have.length(0);
     expect(valueInput).to.have.length(1);
   });
 
+  it("should render a select for value selection, if the filter requests it", () => {
+    const fictionRadioButton = wrapper.find(
+      'input[type="radio"][value="fiction"]'
+    );
+    fictionRadioButton.getDOMNode().checked = true;
+    fictionRadioButton.simulate("change");
+
+    const valueSelect = wrapper.find(".filter-value select");
+    const valueInput = wrapper.find('.filter-value input[type="text"]');
+
+    expect(valueSelect).to.have.length(1);
+    expect(valueInput).to.have.length(0);
+  });
+
+  it("should clear the current value when changing the filter", () => {
+    const valueInput = wrapper.find(".filter-value input");
+
+    valueInput.getDOMNode().value = "ABC";
+    valueInput.simulate("change");
+
+    const filterRadioButton = wrapper.find(
+      'input[type="radio"][value="data_source"]'
+    );
+
+    filterRadioButton.getDOMNode().checked = true;
+    filterRadioButton.simulate("change");
+
+    expect(valueInput.getDOMNode().value).to.equal("");
+  });
+
   it("should render an Add Filter button", () => {
     const button = wrapper.find("button");
 
diff --git a/src/stylesheets/advanced_search.scss b/src/stylesheets/advanced_search.scss
index 3197fb4c1..6ec5c39fd 100644
--- a/src/stylesheets/advanced_search.scss
+++ b/src/stylesheets/advanced_search.scss
@@ -15,8 +15,16 @@
       }
     }
 
-    input[type="text"] {
-      width: 40em;
+    .filter-value {
+      input[type="text"],select {
+        width: 40em;
+      }
+    }
+
+    .filter-operator {
+      select {
+        width: 15em;
+      }
     }
 
     .filter-key-options {