diff --git a/ui/package.json b/ui/package.json
index 98bfc9ee7..0a986a67e 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -4,7 +4,7 @@
   "license": "MIT",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve --proxy-config proxy.conf.json --i18nFile=./src/locale/en.xlf --i18nFormat=xlf --locale=es --aot",
+    "start": "ng serve --proxy-config proxy.conf.json --i18nFile=./src/locale/en.xlf --i18nFormat=xlf --locale=en --aot",
     "build": "ng build",
     "test": "ng test --code-coverage",
     "lint": "ng lint",
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 47850c29d..227165feb 100644
--- a/ui/src/app/metadata-filter/container/new-filter.component.html
+++ b/ui/src/app/metadata-filter/container/new-filter.component.html
@@ -16,15 +16,26 @@
                     <div class="col-lg-6 col-xs-9 ">
                         <fieldset class="">
                             <div class="form-group">
-                                <label for="filterName">
-                                    <ng-container i18n="@@label--filter-name">
-                                        Filter Name
-                                    </ng-container>
-                                    <ng-container i18n="@@label--dashboard-display-only">
-                                        (Dashboard Display Only)
-                                    </ng-container>
-                                    <i class="fa fa-asterisk text-danger" aria-hidden="true"></i>
-                                </label>
+                                <div class="row">
+                                    <label for="filterName" class="col-sm-10">
+                                        <span>
+                                            <ng-container i18n="@@label--filter-name">
+                                                Filter Name
+                                            </ng-container>
+                                            <ng-container i18n="@@label--dashboard-display-only">
+                                                (Dashboard Display Only)
+                                            </ng-container>
+                                            <i class="fa fa-asterisk text-danger" aria-hidden="true"></i>
+                                        </span>
+                                    </label>
+                                    <span class="text-right col-sm-2">
+                                        <ng-template #tooltipFilterName i18n="@@tooltip--filter-name">Filter Name</ng-template>
+                                        <i class="info-icon fa fa-info-circle text-primary fa-lg"
+                                            [ngbPopover]="tooltipFilterName"
+                                            i18n-aria-label="@@tooltip--instruction"
+                                            aria-label="Information icon - press spacebar to read additional information for this form field"></i>
+                                    </span>
+                                </div>
                                 <input id="filterName" type="text" class="form-control" placeholder="" formControlName="filterName" />
                                 <ng-container *ngIf="form.get('filterName').touched && form.get('filterName').invalid">
                                     <small class="form-text text-danger" *ngIf="form.get('filterName').hasError('required')">
@@ -33,10 +44,21 @@
                                 </ng-container>
                             </div>
                             <div class="form-group">
-                                <label for="entityId">
-                                    <ng-container i18n="@@label--search-entity-id">Search Entity ID</ng-container>
-                                    <i class="fa fa-asterisk text-danger" aria-hidden="true"></i>
-                                </label>
+                                <div class="row">
+                                    <label for="entityId" class="col-sm-10">
+                                        <span>
+                                            <ng-container i18n="@@label--search-entity-id">Search Entity ID</ng-container>
+                                            <i class="fa fa-asterisk text-danger" aria-hidden="true"></i>
+                                        </span>
+                                    </label>
+                                    <span class="text-right col-sm-2">
+                                        <ng-template #tooltipFilterEntityId i18n="@@tooltip--search-entity-id">Search Entity ID</ng-template>
+                                        <i class="info-icon fa fa-info-circle text-primary fa-lg"
+                                            [ngbPopover]="tooltipFilterEntityId"
+                                            i18n-aria-label="@@tooltip--instruction"
+                                            aria-label="Information icon - press spacebar to read additional information for this form field"></i>
+                                    </span>
+                                </div>
                                 <auto-complete
                                     id="entityId"
                                     formControlName="entityId"
diff --git a/ui/src/app/metadata-filter/filter.module.ts b/ui/src/app/metadata-filter/filter.module.ts
index ae3d8edab..86f4e7243 100644
--- a/ui/src/app/metadata-filter/filter.module.ts
+++ b/ui/src/app/metadata-filter/filter.module.ts
@@ -10,6 +10,7 @@ import { reducers } from './reducer';
 import { ProviderFormFragmentComponent } from '../metadata-provider/component/forms/provider-form-fragment.component';
 import { ProviderEditorFormModule } from '../metadata-provider/component';
 import { FilterEffects } from './effect/filter.effect';
+import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap';
 
 export const routes: Routes = [
     {
@@ -31,7 +32,8 @@ export const routes: Routes = [
         StoreModule.forFeature('metadata-filter', reducers),
         EffectsModule.forFeature([FilterEffects]),
         RouterModule.forChild(routes),
-        ProviderEditorFormModule
+        ProviderEditorFormModule,
+        NgbPopoverModule
     ],
     providers: []
 })
diff --git a/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.html b/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.html
index 10d6ead8f..af04b8ad6 100644
--- a/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.html
+++ b/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.html
@@ -37,7 +37,7 @@
             <div formArrayName="nameIdFormats" class="form-group" *ngIf="nameIdFormats.length">
                 <div *ngFor="let format of nameIdFormats.controls; let i=index; let isLast=last" class="row">
                     <div class="col">
-                        <label [for]="'nameIdFormat-' + i" class="sr-only">NameId Format {{ i + 1 }}</label>
+                        <label [for]="'nameIdFormat-' + i" class="sr-only">NameID Format {{ i + 1 }}</label>
                         <auto-complete
                             [id]="'nameIdFormat-' + i"
                             [formControlName]="i"
diff --git a/ui/src/app/metadata-provider/component/forms/relying-party-form.component.html b/ui/src/app/metadata-provider/component/forms/relying-party-form.component.html
index 7a7bd074f..7ecbfe253 100644
--- a/ui/src/app/metadata-provider/component/forms/relying-party-form.component.html
+++ b/ui/src/app/metadata-provider/component/forms/relying-party-form.component.html
@@ -60,7 +60,7 @@
                         <button class="btn btn-success btn-sm" (click)="addFormat()" i18n="@@action--add-nameid-format" aria-label="Add nameID format" role="button">Add NameID Format</button>
                     </span>
                     <span class="col-sm-2 text-right">
-                        <ng-template #tooltipNameIdFormat i18n="@@tooltip--nameid-format">Add NameId Format popover</ng-template>
+                        <ng-template #tooltipNameIdFormat i18n="@@tooltip--nameid-format">Add NameID Format popover</ng-template>
                         <i class="info-icon fa fa-info-circle text-primary fa-lg"
                            [ngbPopover]="tooltipNameIdFormat"
                            i18n-aria-label="@@tooltip--instruction"
@@ -69,7 +69,7 @@
                 </div>
                 <div *ngIf="nameIdFormats.length" class="p-2">
                     <div class="row" *ngFor="let format of nameIdFormats.controls; let i=index; let isLast=last">
-                        <label [for]="'nameIdFormat-' + i" class="col-sm-12" i18n="@@label--nameid-format-indexed">NameId Format {{ i + 1 }}</label>
+                        <label [for]="'nameIdFormat-' + i" class="col-sm-12" i18n="@@label--nameid-format-indexed">NameID Format {{ i + 1 }}</label>
                         <auto-complete
                             [id]="'nameIdFormat-' + i"
                             [formControlName]="i"
@@ -79,7 +79,7 @@
                             class="col-sm-11">
                         </auto-complete>
                         <div class="col-sm-1 text-right">
-                            <button class="btn btn-link" (click)="removeFormat(i)" aria-label="Delete nameID format" role="button">
+                            <button class="btn btn-link" (click)="removeFormat(i)" aria-label="Delete NameID format" role="button">
                                 <i class="fa fa-trash fa-lg text-danger"></i>
                             </button>
                         </div>
diff --git a/ui/src/locale/en.xlf b/ui/src/locale/en.xlf
index f6d05993a..851a1a5e0 100644
--- a/ui/src/locale/en.xlf
+++ b/ui/src/locale/en.xlf
@@ -1956,8 +1956,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="label--nameid-format-indexed" datatype="html">
-        <source>NameId Format <x id="INTERPOLATION" equiv-text="{{ i + 1 }}"/></source>
-        <target>NameId Format <x id="INTERPOLATION" equiv-text="{{ i + 1 }}"/></target>
+        <source>NameID Format <x id="INTERPOLATION" equiv-text="{{ i + 1 }}"/></source>
+        <target>NameID Format <x id="INTERPOLATION" equiv-text="{{ i + 1 }}"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">app/metadata-provider/component/forms/finish-form.component.ts</context>
           <context context-type="linenumber">76</context>
@@ -2008,7 +2008,7 @@
         <target>Filter Name</target>
         <context-group purpose="location">
           <context context-type="sourcefile">app/metadata-filter/container/new-filter.component.ts</context>
-          <context context-type="linenumber">30</context>
+          <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit>
       <trans-unit id="label--dashboard-display-only" datatype="html">
@@ -2016,7 +2016,15 @@
         <target>(Dashboard Display Only)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">app/metadata-filter/container/new-filter.component.ts</context>
-          <context context-type="linenumber">32</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="tooltip--filter-name" datatype="html">
+        <source>Filter Name</source>
+        <target>Filter Name</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/metadata-filter/container/new-filter.component.ts</context>
+          <context context-type="linenumber">30</context>
         </context-group>
       </trans-unit>
       <trans-unit id="label--search-entity-id" datatype="html">
@@ -2027,6 +2035,22 @@
           <context context-type="linenumber">46</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="tooltip--search-entity-id" datatype="html">
+        <source>Search Entity ID</source>
+        <target>Search Entity ID</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/metadata-filter/container/new-filter.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="action--save-changes" datatype="html">
+        <source>Save Changes</source>
+        <target>Save Changes</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/metadata-filter/container/new-filter.component.ts</context>
+          <context context-type="linenumber">79</context>
+        </context-group>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/ui/src/locale/es.xlf b/ui/src/locale/es.xlf
index 2a9c768de..69b2504ce 100644
--- a/ui/src/locale/es.xlf
+++ b/ui/src/locale/es.xlf
@@ -1952,8 +1952,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="label--nameid-format-indexed" datatype="html">
-        <source>NameId Format <x id="INTERPOLATION" equiv-text="{{ i + 1 }}"/></source>
-        <target>NameId Format <x id="INTERPOLATION" equiv-text="{{ i + 1 }}"/> (es)</target>
+        <source>NameID Format <x id="INTERPOLATION" equiv-text="{{ i + 1 }}"/></source>
+        <target>NameID Format <x id="INTERPOLATION" equiv-text="{{ i + 1 }}"/> (es)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">app/metadata-provider/component/forms/finish-form.component.ts</context>
           <context context-type="linenumber">76</context>
@@ -1999,6 +1999,54 @@
           <context context-type="linenumber">60</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="label--filter-name" datatype="html">
+        <source>Filter Name</source>
+        <target>Filter Name (es)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/metadata-filter/container/new-filter.component.ts</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="label--dashboard-display-only" datatype="html">
+        <source>(Dashboard Display Only)</source>
+        <target>(Dashboard Display Only) (es)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/metadata-filter/container/new-filter.component.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="tooltip--filter-name" datatype="html">
+        <source>Filter Name</source>
+        <target>Filter Name (es)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/metadata-filter/container/new-filter.component.ts</context>
+          <context context-type="linenumber">30</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="label--search-entity-id" datatype="html">
+        <source>Search Entity ID</source>
+        <target>Search Entity ID (es)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/metadata-filter/container/new-filter.component.ts</context>
+          <context context-type="linenumber">46</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="tooltip--search-entity-id" datatype="html">
+        <source>Search Entity ID</source>
+        <target>Search Entity ID (es)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/metadata-filter/container/new-filter.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="action--save-changes" datatype="html">
+        <source>Save Changes</source>
+        <target>Save Changes (es)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/metadata-filter/container/new-filter.component.ts</context>
+          <context context-type="linenumber">79</context>
+        </context-group>
+      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file