diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 77ca7f957..8cc2c8dd3 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -728,4 +728,15 @@ tooltip.group-description=Group Description
 tooltip.role-name=Role Name
 tooltip.role-description=Role Description
 
-tooltip.contact-information=Contact Information
\ No newline at end of file
+tooltip.contact-information=Contact Information
+
+label.algorithm=Algorithm
+tooltip.algorithm=Block encryption algorithms are designed for encrypting and decrypting data in fixed size, multiple octet blocks.
+
+value.algorithm-gcm-256=GCM (256) - http://www.w3.org/2009/xmlenc11#aes256-gcm
+value.algorithm-gcm-192=GCM (192) - http://www.w3.org/2009/xmlenc11#aes192-gcm
+value.algorithm-gcm-128=GCM (128) - http://www.w3.org/2009/xmlenc11#aes128-gcm
+value.algorithm-cbc-256=CBC (256) - http://www.w3.org/2001/04/xmlenc#aes256-cbc
+value.algorithm-cbc-192=CBC (192) - http://www.w3.org/2001/04/xmlenc#aes192-cbc
+value.algorithm-cbc-128=CBC (128) - http://www.w3.org/2001/04/xmlenc#aes128-cbc
+value.algorithm-cbc-tripledes=CBC (TRIPLEDES) - http://www.w3.org/2001/04/xmlenc#tripledes-cbc
diff --git a/ui/public/assets/schema/filter/algorithm.schema.json b/ui/public/assets/schema/filter/algorithm.schema.json
new file mode 100644
index 000000000..879bb4ddc
--- /dev/null
+++ b/ui/public/assets/schema/filter/algorithm.schema.json
@@ -0,0 +1,76 @@
+{
+    "type": "object",
+    "required": ["name"],
+    "properties": {
+        "name": {
+            "title": "label.filter-name",
+            "description": "tooltip.filter-name",
+            "type": "string"
+        },
+        "filterEnabled": {
+            "title": "label.enable-filter",
+            "description": "tooltip.enable-filter",
+            "type": "boolean",
+            "default": false
+        },
+        "algorithmFilterTarget": {
+            "title": "label.search-criteria",
+            "description": "tooltip.search-criteria",
+            "type": "object",
+            "properties": {
+                "algorithmFilterTargetType": {
+                    "title": "label.filter-target-type",
+                    "type": "string",
+                    "default": "ENTITY",
+                    "enum": ["ENTITY", "REGEX", "CONDITION_SCRIPT"],
+                    "enumNames": [
+                        "value.entity-id",
+                        "value.regex",
+                        "value.script"
+                    ]
+                },
+                "value": {
+                    "title": "label.filter-target-value",
+                    "type": "array",
+                    "minItems": 1,
+                    "uniqueItems": true,
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "required": ["value", "algorithmFilterTargetType"]
+        },
+        "@type": {
+            "type": "string",
+            "default": "NameIDFormat"
+        },
+        "version": {
+            "type": "integer"
+        },
+        "algorithm": {
+            "title": "label.algorithm",
+            "description": "tooltip.algorithm",
+            "type": "string",
+            "enum": [
+                "http://www.w3.org/2009/xmlenc11#aes256-gcm",
+                "http://www.w3.org/2009/xmlenc11#aes192-gcm",
+                "http://www.w3.org/2009/xmlenc11#aes128-gcm",
+                "http://www.w3.org/2001/04/xmlenc#aes256-cbc",
+                "http://www.w3.org/2001/04/xmlenc#aes192-cbc",
+                "http://www.w3.org/2001/04/xmlenc#aes128-cbc",
+                "http://www.w3.org/2001/04/xmlenc#tripledes-cbc"
+            ],
+            "enumNames": [
+                "value.algorithm-gcm-256",
+                "value.algorithm-gcm-192",
+                "value.algorithm-gcm-128",
+                "value.algorithm-cbc-256",
+                "value.algorithm-cbc-192",
+                "value.algorithm-cbc-128",
+                "value.algorithm-cbc-tripledes"
+            ]
+        }
+    },
+    "definitions": {}
+}
diff --git a/ui/src/app/form/component/fields/FilterTargetField.js b/ui/src/app/form/component/fields/FilterTargetField.js
index 0cdaa50ce..0866ab2bf 100644
--- a/ui/src/app/form/component/fields/FilterTargetField.js
+++ b/ui/src/app/form/component/fields/FilterTargetField.js
@@ -256,7 +256,8 @@ const FilterTargetField = ({
                                     <Button variant="success"
                                         type="button"
                                         disabled={!term || !match}
-                                        onClick={() => onSelectValue(term)}>
+                                        onClick={() => onSelectValue(term)}
+                                        style={{minWidth: '160px'}}>
                                         <Translate value="action.add-entity-id">Add Entity ID</Translate>&nbsp;&nbsp;
                                         <FontAwesomeIcon icon={faPlus} />
                                     </Button>
diff --git a/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js b/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js
new file mode 100644
index 000000000..4841b5c89
--- /dev/null
+++ b/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js
@@ -0,0 +1,61 @@
+import defaultsDeep from "lodash/defaultsDeep";
+// import API_BASE_PATH from "../../../../App.constant";
+import { BASE_PATH } from '../../../../App.constant';
+import { BaseFilterDefinition } from "./BaseFilterDefinition";
+
+export const AlgorithmFilterWizard = {
+    ...BaseFilterDefinition,
+    uiSchema: defaultsDeep({
+        algorithmFilterTarget: {
+            'ui:field': 'FilterTargetField',
+            api: ''
+        },
+        formats: {
+            "ui:options": {
+                orderable: false
+            },
+            items: {
+                'ui:widget': 'OptionWidget'
+            }
+        }
+    }, BaseFilterDefinition.uiSchema),
+    label: 'Algorithm',
+    type: 'Algorithm',
+    // schema: `${API_BASE_PATH}/ui/AlgorithmFilter`,
+    schema: `${BASE_PATH}assets/schema/filter/algorithm.schema.json`,
+    steps: [],
+    validator: (data = [], current = { resourceId: null }, group) => {
+        return BaseFilterDefinition.validator(data, current, group, 'algorithmFilterTarget', 'algorithmFilterTargetType')
+    },
+    formatter: (changes) => ({
+        ...changes,
+        '@type': AlgorithmFilterWizard.type
+    })
+};
+
+export const AlgorithmFilterEditor = {
+    ...AlgorithmFilterWizard,
+    steps: [
+        {
+            id: 'common',
+            label: 'label.target',
+            index: 1,
+            fields: [
+                'name',
+                '@type',
+                'resourceId',
+                'algorithmFilterTarget',
+                'filterEnabled'
+            ]
+        },
+        {
+            id: 'options',
+            label: 'label.options',
+            index: 2,
+            initialValues: [],
+            fields: [
+                'algorithm'
+            ]
+        }
+    ]
+};
\ No newline at end of file
diff --git a/ui/src/app/metadata/domain/filter/index.js b/ui/src/app/metadata/domain/filter/index.js
index 9f5326ba9..fe4af7fd1 100644
--- a/ui/src/app/metadata/domain/filter/index.js
+++ b/ui/src/app/metadata/domain/filter/index.js
@@ -1,14 +1,17 @@
 import { EntityAttributesFilterEditor } from './definition/EntityAttributesFilterDefinition';
 import { NameIDFilterEditor } from './definition/NameIdFilterDefinition';
+import { AlgorithmFilterEditor } from './definition/AlgorithmFilterDefinition';
 
 export const MetadataFilterWizardTypes = {
     EntityAttributes: EntityAttributesFilterEditor,
-    NameIDFormat: NameIDFilterEditor
+    NameIDFormat: NameIDFilterEditor,
+    Algorithm: AlgorithmFilterEditor,
 };
 
 export const MetadataFilterEditorTypes = [
     EntityAttributesFilterEditor,
-    NameIDFilterEditor
+    NameIDFilterEditor,
+    AlgorithmFilterEditor,
 ];
 
 export const MetadataFilterTypes = [