diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.jsx
index 70e87ee6aa..0c23c0c2b2 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.jsx
@@ -95,8 +95,8 @@ function InventoryStep({ i18n }) {
           key: 'name',
         },
       ]}
-      toolbarSearchableKeys={searchableKeys}
-      toolbarRelatedSearchableKeys={relatedSearchableKeys}
+      searchableKeys={searchableKeys}
+      relatedSearchableKeys={relatedSearchableKeys}
       header={i18n._(t`Inventory`)}
       name="inventory"
       qsConfig={QS_CONFIG}
diff --git a/awx/ui_next/src/components/Lookup/ApplicationLookup.jsx b/awx/ui_next/src/components/Lookup/ApplicationLookup.jsx
index bbcc1eabe6..8056114046 100644
--- a/awx/ui_next/src/components/Lookup/ApplicationLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/ApplicationLookup.jsx
@@ -101,8 +101,8 @@ function ApplicationLookup({ i18n, onChange, value, label }) {
                 key: 'description',
               },
             ]}
-            toolbarSearchableKeys={searchableKeys}
-            toolbarRelatedSearchableKeys={relatedSearchableKeys}
+            searchableKeys={searchableKeys}
+            relatedSearchableKeys={relatedSearchableKeys}
             readOnly={!canDelete}
             name="application"
             selectItem={item => dispatch({ type: 'SELECT_ITEM', item })}
diff --git a/awx/ui_next/src/components/Lookup/CredentialLookup.jsx b/awx/ui_next/src/components/Lookup/CredentialLookup.jsx
index aed9f15d73..2d7d109d83 100644
--- a/awx/ui_next/src/components/Lookup/CredentialLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/CredentialLookup.jsx
@@ -139,8 +139,8 @@ function CredentialLookup({
                 key: 'name',
               },
             ]}
-            toolbarSearchableKeys={searchableKeys}
-            toolbarRelatedSearchableKeys={relatedSearchableKeys}
+            searchableKeys={searchableKeys}
+            relatedSearchableKeys={relatedSearchableKeys}
             readOnly={!canDelete}
             name="credential"
             selectItem={item => dispatch({ type: 'SELECT_ITEM', item })}
diff --git a/awx/ui_next/src/components/Lookup/InstanceGroupsLookup.jsx b/awx/ui_next/src/components/Lookup/InstanceGroupsLookup.jsx
index c44f17cd14..21fe8cfa8f 100644
--- a/awx/ui_next/src/components/Lookup/InstanceGroupsLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/InstanceGroupsLookup.jsx
@@ -100,8 +100,8 @@ function InstanceGroupsLookup(props) {
                 key: 'name',
               },
             ]}
-            toolbarSearchableKeys={searchableKeys}
-            toolbarRelatedSearchableKeys={relatedSearchableKeys}
+            searchableKeys={searchableKeys}
+            relatedSearchableKeys={relatedSearchableKeys}
             multiple={state.multiple}
             header={i18n._(t`Instance Groups`)}
             name="instanceGroups"
diff --git a/awx/ui_next/src/components/Lookup/InventoryLookup.jsx b/awx/ui_next/src/components/Lookup/InventoryLookup.jsx
index 46e4d4f0c5..117e0cebb8 100644
--- a/awx/ui_next/src/components/Lookup/InventoryLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/InventoryLookup.jsx
@@ -88,8 +88,8 @@ function InventoryLookup({ value, onChange, onBlur, required, i18n, history }) {
                 key: 'name',
               },
             ]}
-            toolbarSearchableKeys={searchableKeys}
-            toolbarRelatedSearchableKeys={relatedSearchableKeys}
+            searchableKeys={searchableKeys}
+            relatedSearchableKeys={relatedSearchableKeys}
             multiple={state.multiple}
             header={i18n._(t`Inventory`)}
             name="inventory"
diff --git a/awx/ui_next/src/components/Lookup/InventoryScriptLookup.jsx b/awx/ui_next/src/components/Lookup/InventoryScriptLookup.jsx
index fb29a7a63e..d5638fc831 100644
--- a/awx/ui_next/src/components/Lookup/InventoryScriptLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/InventoryScriptLookup.jsx
@@ -125,8 +125,8 @@ function InventoryScriptLookup({
                 key: 'name',
               },
             ]}
-            toolbarSearchableKeys={searchableKeys}
-            toolbarRelatedSearchableKeys={relatedSearchableKeys}
+            searchableKeys={searchableKeys}
+            relatedSearchableKeys={relatedSearchableKeys}
           />
         )}
       />
diff --git a/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.jsx b/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.jsx
index 1169961740..723bdebc5a 100644
--- a/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.jsx
@@ -181,8 +181,8 @@ function MultiCredentialsLookup(props) {
                   key: 'name',
                 },
               ]}
-              toolbarSearchableKeys={searchableKeys}
-              toolbarRelatedSearchableKeys={relatedSearchableKeys}
+              searchableKeys={searchableKeys}
+              relatedSearchableKeys={relatedSearchableKeys}
               multiple={isVault}
               header={i18n._(t`Credentials`)}
               name="credentials"
diff --git a/awx/ui_next/src/components/Search/AdvancedSearch.jsx b/awx/ui_next/src/components/Search/AdvancedSearch.jsx
index 04b43614c0..cb1d8b72bd 100644
--- a/awx/ui_next/src/components/Search/AdvancedSearch.jsx
+++ b/awx/ui_next/src/components/Search/AdvancedSearch.jsx
@@ -95,32 +95,25 @@ function AdvancedSearch({
       >
         <SelectOption
           key="and"
-          value={i18n._(t`and`)}
+          value="and"
           description={i18n._(
             t`Returns results that satisfy this one as well as other filters.  This is the default set type if nothing is selected.`
           )}
         />
         <SelectOption
           key="or"
-          value={i18n._(t`or`)}
+          value="or"
           description={i18n._(
             t`Returns results that satisfy this one or any other filters.`
           )}
         />
         <SelectOption
           key="not"
-          value={i18n._(t`not`)}
+          value="not"
           description={i18n._(
             t`Returns results that have values other than this one as well as other filters.`
           )}
         />
-        <SelectOption
-          key="or_not"
-          value={i18n._(t`or/not`)}
-          description={i18n._(
-            t`Returns results that have values other than this one or any other filters.`
-          )}
-        />
       </Select>
       <Select
         aria-label={i18n._(t`Key select`)}