diff --git a/frontend/src/Settings/DownloadClients/Options/DownloadClientOptionsConnector.js b/frontend/src/Settings/DownloadClients/Options/DownloadClientOptionsConnector.js
index ef97de47f..f6cd7eb4f 100644
--- a/frontend/src/Settings/DownloadClients/Options/DownloadClientOptionsConnector.js
+++ b/frontend/src/Settings/DownloadClients/Options/DownloadClientOptionsConnector.js
@@ -64,7 +64,7 @@ class DownloadClientOptionsConnector extends Component {
   }
 
   componentWillUnmount() {
-    this.props.dispatchClearPendingChanges({ section: SECTION });
+    this.props.dispatchClearPendingChanges({ section: `settings.${SECTION}` });
   }
 
   //
diff --git a/frontend/src/Settings/Indexers/Options/IndexerOptionsConnector.js b/frontend/src/Settings/Indexers/Options/IndexerOptionsConnector.js
index 28d07c77e..545ee871a 100644
--- a/frontend/src/Settings/Indexers/Options/IndexerOptionsConnector.js
+++ b/frontend/src/Settings/Indexers/Options/IndexerOptionsConnector.js
@@ -64,7 +64,7 @@ class IndexerOptionsConnector extends Component {
   }
 
   componentWillUnmount() {
-    this.props.dispatchClearPendingChanges({ section: SECTION });
+    this.props.dispatchClearPendingChanges({ section: `settings.${SECTION}` });
   }
 
   //
diff --git a/frontend/src/Settings/MediaManagement/Naming/NamingConnector.js b/frontend/src/Settings/MediaManagement/Naming/NamingConnector.js
index d8210317e..2c1b00958 100644
--- a/frontend/src/Settings/MediaManagement/Naming/NamingConnector.js
+++ b/frontend/src/Settings/MediaManagement/Naming/NamingConnector.js
@@ -50,7 +50,7 @@ class NamingConnector extends Component {
   }
 
   componentWillUnmount() {
-    this.props.clearPendingChanges({ section: SECTION });
+    this.props.clearPendingChanges({ section: `settings.${SECTION}` });
   }
 
   //
diff --git a/frontend/src/Store/Actions/Settings/indexers.js b/frontend/src/Store/Actions/Settings/indexers.js
index 79541ba88..a65b41f3c 100644
--- a/frontend/src/Store/Actions/Settings/indexers.js
+++ b/frontend/src/Store/Actions/Settings/indexers.js
@@ -112,7 +112,8 @@ export default {
     [SELECT_INDEXER_SCHEMA]: (state, { payload }) => {
       return selectProviderSchema(state, section, payload, (selectedSchema) => {
         selectedSchema.enableRss = selectedSchema.supportsRss;
-        selectedSchema.enableSearch = selectedSchema.supportsSearch;
+        selectedSchema.enableAutomaticSearch = selectedSchema.supportsSearch;
+        selectedSchema.enableInteractiveSearch = selectedSchema.supportsSearch;
 
         return selectedSchema;
       });