diff --git a/ui/src/app/admin/container/MetadataActions.js b/ui/src/app/admin/container/MetadataActions.js
index 4500354f4..4af521db5 100644
--- a/ui/src/app/admin/container/MetadataActions.js
+++ b/ui/src/app/admin/container/MetadataActions.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { DeleteConfirmation } from '../../core/components/DeleteConfirmation';
-import { useMetadataEntity } from '../../metadata/hooks/api';
+import { useMetadataActivator, useMetadataEntity } from '../../metadata/hooks/api';
 
 import { NotificationContext, createNotificationAction } from '../../notifications/hoc/Notifications';
 
@@ -8,16 +8,15 @@ export function MetadataActions ({type, children}) {
 
     const { dispatch } = React.useContext(NotificationContext);
 
-    const { del, put, response } = useMetadataEntity(type, {
+    const { del, response } = useMetadataEntity(type, {
         cachePolicy: 'no-cache'
     });
 
+    const activator = useMetadataActivator(type);
+
     async function enableEntity(entity, enabled, cb = () => {}) {
-        await put(`/${type === 'source' ? entity.id : entity.resourceId}`, {
-            ...entity,
-            [type === 'source' ? 'serviceEnabled' : 'enabled']: enabled
-        });
-        if (response.ok) {
+        await activator.patch(`/${type === 'source' ? entity.id : entity.resourceId}/${enabled ? 'enable' : 'disable'}`);
+        if (activator?.response.ok) {
             dispatch(createNotificationAction(
                 `Metadata ${type} has been ${enabled ? 'enabled' : 'disabled'}.`
             ));
diff --git a/ui/src/app/metadata/domain/filter/component/MetadataFilterConfigurationList.js b/ui/src/app/metadata/domain/filter/component/MetadataFilterConfigurationList.js
index 04c33c10f..74b879698 100644
--- a/ui/src/app/metadata/domain/filter/component/MetadataFilterConfigurationList.js
+++ b/ui/src/app/metadata/domain/filter/component/MetadataFilterConfigurationList.js
@@ -2,13 +2,12 @@ import React from 'react';
 
 import { Ordered } from '../../../../dashboard/component/Ordered';
 import { Translate } from '../../../../i18n/components/translate';
-import { MetadataFilters, MetadataFiltersContext } from './MetadataFilters';
+import { MetadataFilters } from './MetadataFilters';
 
 import { MetadataFilterConfigurationListItem } from './MetadataFilterConfigurationListItem';
 import { MetadataFilterTypes } from '..';
 
-export function MetadataFilterConfigurationList ({provider, onDelete, editable = true}) {
-    // const filters = React.useContext(MetadataFiltersContext);
+export function MetadataFilterConfigurationList ({provider, editable = true}) {
 
     return (
         <MetadataFilters providerId={provider.resourceId} types={MetadataFilterTypes}>
diff --git a/ui/src/app/metadata/domain/filter/component/MetadataFilters.js b/ui/src/app/metadata/domain/filter/component/MetadataFilters.js
index c9f7d39a4..d8a1d8242 100644
--- a/ui/src/app/metadata/domain/filter/component/MetadataFilters.js
+++ b/ui/src/app/metadata/domain/filter/component/MetadataFilters.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { useMetadataFilters } from '../../../hooks/api';
+import { useMetadataFilters, useFilterActivator } from '../../../hooks/api';
 import { DeleteConfirmation } from '../../../../core/components/DeleteConfirmation';
 import { NotificationContext, createNotificationAction } from '../../../../notifications/hoc/Notifications';
 
@@ -13,6 +13,10 @@ export function MetadataFilters ({ providerId, types = [], filters, children })
         cachePolicy: 'no-cache'
     });
 
+    const { patch } = useFilterActivator(providerId, {
+        cachePolicy: 'no-cache'
+    });
+
     const [filterData, setFilterData] = React.useState([]);
 
     async function loadFilters(id) {
@@ -33,7 +37,7 @@ export function MetadataFilters ({ providerId, types = [], filters, children })
     }
 
     async function enableFilter(filter, enabled) {
-        await put(`/${filter.resourceId}`, {
+        await patch(`/${filter.resourceId}/${enabled ? 'enable' : 'disable'}`, {
             ...filter,
             filterEnabled: enabled
         });
diff --git a/ui/src/app/metadata/domain/source/component/SourceList.js b/ui/src/app/metadata/domain/source/component/SourceList.js
index 992f96b92..60bce07f2 100644
--- a/ui/src/app/metadata/domain/source/component/SourceList.js
+++ b/ui/src/app/metadata/domain/source/component/SourceList.js
@@ -7,7 +7,7 @@ import Form from 'react-bootstrap/Form';
 import OverlayTrigger from 'react-bootstrap/OverlayTrigger';
 
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faTrash, faCheck } from '@fortawesome/free-solid-svg-icons';
+import { faTrash } from '@fortawesome/free-solid-svg-icons';
 
 import FormattedDate from '../../../../core/components/FormattedDate';
 import Translate from '../../../../i18n/components/translate';
diff --git a/ui/src/app/metadata/hooks/api.js b/ui/src/app/metadata/hooks/api.js
index cc2afa9c7..49e11f338 100644
--- a/ui/src/app/metadata/hooks/api.js
+++ b/ui/src/app/metadata/hooks/api.js
@@ -132,6 +132,18 @@ export function useMetadataUpdater (path, current) {
     }
 }
 
+export function useMetadataActivator(type, opts = {
+    cachePolicy: 'no-cache'
+}) {
+    return useFetch(`${API_BASE_PATH}/activate/${type === 'source' ? 'entityDescriptor' : 'MetadataResolvers'}/`, opts);
+}
+
+export function useFilterActivator(providerId, opts = {
+    cachePolicy: 'no-cache'
+}) {
+    return useFetch(`${API_BASE_PATH}/activate${getMetadataPath('provider')}/${providerId}/Filter`, opts);
+}
+
 export function useMetadataAttributes (opts = {}, onMount) {
     //
     return useFetch(`${API_BASE_PATH}/custom/entity/attributes`, opts, onMount);