diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties
index cc6fb7662..35aa48c2e 100644
--- a/backend/src/main/resources/i18n/messages_en.properties
+++ b/backend/src/main/resources/i18n/messages_en.properties
@@ -186,9 +186,9 @@ label.authentication-methods-to-use=Authentication Methods to Use
 label.auth-method-indexed=Authentication Method
 label.preview-provider=Preview XML
 label.search-entity-id=Search Entity Id
-label.edit-filter=Edit EntityAttributesFilter
+label.edit-filter=Edit Filter
 label.min-4-chars=Minimum 4 characters.
-label.new-filter=New Filter - EntityAttributes
+label.new-filter=New Filter
 label.service-provider=Metadata Source Name:
 label.created-date=Created Date:
 label.service-entity-id=Metadata Source Entity ID:
diff --git a/ui/src/app/metadata/filter/container/edit-filter.component.html b/ui/src/app/metadata/filter/container/edit-filter.component.html
index f0eea6d90..7ede75f1c 100644
--- a/ui/src/app/metadata/filter/container/edit-filter.component.html
+++ b/ui/src/app/metadata/filter/container/edit-filter.component.html
@@ -6,7 +6,7 @@
                     <span class="display-6">
                         <i class="fa fa-fw fa-gears"></i>&nbsp;&nbsp;
                         <ng-container *ngIf="type$ | async">
-                            <translate-i18n key="label.edit-filter">Edit Filter</translate-i18n>&ndash; {{ type$ | async }}
+                            <translate-i18n key="label.edit-filter">Edit Filter</translate-i18n> &ndash; {{ type$ | async }}
                         </ng-container>
                     </span>
                 </div>
diff --git a/ui/src/app/metadata/filter/container/new-filter.component.html b/ui/src/app/metadata/filter/container/new-filter.component.html
index 47f622e3b..96f939fd7 100644
--- a/ui/src/app/metadata/filter/container/new-filter.component.html
+++ b/ui/src/app/metadata/filter/container/new-filter.component.html
@@ -5,7 +5,7 @@
                 <div class="col-md-12">
                     <span class="display-6">
                         <i class="fa fa-fw fa-gears"></i>&nbsp;&nbsp;
-                        <translate-i18n key="label.new-filter">New Filter - EntityAttributes</translate-i18n>
+                        <translate-i18n key="label.new-filter">New Filter</translate-i18n>
                     </span>
                 </div>
             </div>
@@ -15,8 +15,11 @@
                 <div class="d-flex justify-content-between">
                     <form [formGroup]="form" class="d-block w-50">
                         <div class="form-group">
-                            <label for="type">
-                                <translate-i18n key="label.select-filter-type">Select Filter Type</translate-i18n>
+                            <label for="type" class="d-flex justify-content-start control-label">
+                                <span>
+                                    <translate-i18n key="label.select-filter-type">Select Filter Type</translate-i18n>
+                                    <i class="fa fa-asterisk text-danger" aria-hidden="true"></i>
+                                </span>
                             </label>
                             <select class="form-control" formControlName="type" name="type">
                                 <option value="" disabled>
diff --git a/ui/src/app/schema-form/widget/filter-target/filter-target.component.html b/ui/src/app/schema-form/widget/filter-target/filter-target.component.html
index 43ff94a15..c4aed1ec5 100644
--- a/ui/src/app/schema-form/widget/filter-target/filter-target.component.html
+++ b/ui/src/app/schema-form/widget/filter-target/filter-target.component.html
@@ -37,9 +37,7 @@
                         <translate-i18n key="label.search-criteria-by" [params]="{ displayType: (displayType | translate) }">
                             Search Criteria by {{ this.displayType | translate }}
                         </translate-i18n>&nbsp;&nbsp;
-                        <i class="fa fa-asterisk text-danger"
-                            aria-hidden="true"
-                            *ngIf="targetType !== 'ENTITY'"></i>
+                        <i class="fa fa-asterisk text-danger" aria-hidden="true"></i>
                     </span>
                     <span>
                         <info-icon [description]="'label.search-criteria-by' | translate:{ displayType: (displayType | translate) }"></info-icon>