diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 0a03daf3f..92f1edb6f 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -293,7 +293,7 @@ label.or=or
 label.name-and-upload-url=Name and Upload Url
 label.service-resolver-file=Select Provider Metadata File
 label.service-resolver-metadata-url=Service Provider Metadata URL
-label.search-criteria-by=The value used to search against, such as a regex pattern or entityID to match against.
+label.search-criteria-by=Search Criteria by { displayType }
 label.entity-ids-added=Entity Ids Added
 label.ui-mdui-info=User Interface / MDUI Information
 label.sp-sso-descriptor-info=SP SSO Descriptor Information
@@ -753,6 +753,7 @@ tooltip.external-description=A brief description of the purpose of this filter.
 
 label.algorithm=Algorithm
 tooltip.algorithm=Block encryption algorithms are designed for encrypting and decrypting data in fixed size, multiple octet blocks.
+tooltip.search-criteria-by=The value used to search against, such as a regex pattern or entityID to match against.
 
 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
diff --git a/ui/src/app/form/component/fields/FilterTargetField.js b/ui/src/app/form/component/fields/FilterTargetField.js
index 59c6ab178..f78c522dd 100644
--- a/ui/src/app/form/component/fields/FilterTargetField.js
+++ b/ui/src/app/form/component/fields/FilterTargetField.js
@@ -171,7 +171,7 @@ const FilterTargetField = ({
                                 <i className="fa fa-asterisk text-danger" aria-hidden="true"></i>
                             </span>
                             <span>
-                                <InfoIcon value={translate('label.search-criteria-by', { displayType: translate(displayType) })}></InfoIcon>
+                                <InfoIcon value={translate('tooltip.search-criteria-by', { displayType: translate(displayType) })}></InfoIcon>
                             </span>
                         </label>
                         <div className="d-flex justify-content-between">
diff --git a/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js b/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js
index 5d19288fb..8b206b1c4 100644
--- a/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js
+++ b/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js
@@ -28,7 +28,7 @@ export const AlgorithmFilterWizard = {
 
         return (formData, errors) => {
             const errorList = base(formData, errors);
-            const { algorithms } = formData;
+            const { algorithms = [] } = formData;
 
             const dupes = algorithms.filter((item, index) => index !== algorithms.indexOf(item));