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 3dedb28f6..33ea36cc7 100644
--- a/ui/src/app/metadata/filter/container/edit-filter.component.html
+++ b/ui/src/app/metadata/filter/container/edit-filter.component.html
@@ -5,18 +5,13 @@
                 <div class="col-md-12">
                     <span class="display-6">
                         <i class="fa fa-fw fa-gears"></i>
-                        <ng-container i18n="@@label--new-filter">new EntityAttributesFilter</ng-container>
+                        <ng-container i18n="@@label--new-filter">&nbsp; Edit EntityAttributesFilter - {{ filter.name }}</ng-container>
                     </span>
                 </div>
             </div>
         </div>
         <div class="section-body p-4 border border-top-0 border-info" *ngIf="schema$ | async">
             <div class="mx-3 my-2 d-flex justify-content-end">
-                <button (click)="this.preview(filter)" type="submit" class="btn btn-success">
-                    <i class="fa fa-fw fa-eye fa-lg"></i>
-                    <ng-container i18n="@@action--save">Preview XML</ng-container>
-                </button>
-                &nbsp;
                 <button (click)="this.save()" type="submit" class="btn btn-primary" [disabled]="!isValid || (isSaving$ | async)">
                     <i class="fa fa-fw fa-lg" [ngClass]="{
                         'fa-save': !(isSaving$ | async),
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 2ab55b2ae..22c07b036 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>
-                        <ng-container i18n="@@label--new-filter">new EntityAttributesFilter</ng-container>
+                        <ng-container i18n="@@label--new-filter">&nbsp; New Filter - EntityAttributes</ng-container>
                     </span>
                 </div>
             </div>
diff --git a/ui/src/app/metadata/manager/component/provider-item.component.html b/ui/src/app/metadata/manager/component/provider-item.component.html
index 9a5d1fbc7..f8441c696 100644
--- a/ui/src/app/metadata/manager/component/provider-item.component.html
+++ b/ui/src/app/metadata/manager/component/provider-item.component.html
@@ -30,8 +30,7 @@
             <div>
                 <button class="btn btn-primary btn-filter pull-left" (click)="viewFilters.emit(provider)">
                         <i class="fa fa-filter"></i>&nbsp;
-                        <span class="label">Active Filters</span>&nbsp;
-                        <span class="badge badge-light">{{ provider.metadataFilters.length }}</span>
+                        <span class="label">Manage Filters</span>
                 </button>
                 <button class="btn btn-link pull-right" (click)="select.emit(provider)" aria-label="Edit selected service provider">
                     <i class="fa fa-fw fa-edit fa-2x"></i>