diff --git a/ui/src/app/metadata-filter/component/filter-form.component.html b/ui/src/app/metadata-filter/component/filter-form.component.html
index 4609c6f85..f0c6cfcfb 100644
--- a/ui/src/app/metadata-filter/component/filter-form.component.html
+++ b/ui/src/app/metadata-filter/component/filter-form.component.html
@@ -70,7 +70,7 @@
             <!--
                 <button (click)="onPreview.emit()" type="submit" class="btn btn-success">
                     <i class="fa fa-eye fa-lg"></i>
-                    <ng-container i18n="@@action--save-changes">Preview XML</ng-container>
+                    <ng-container i18n="@@action--preview-xml">Preview XML</ng-container>
                 </button>
             -->
             <button (click)="onSave.emit(provider)" type="submit" class="btn btn-primary" [disabled]="form.invalid">
diff --git a/ui/src/app/metadata-filter/component/search-dialog.component.html b/ui/src/app/metadata-filter/component/search-dialog.component.html
index ea20d5ce0..b850746c8 100644
--- a/ui/src/app/metadata-filter/component/search-dialog.component.html
+++ b/ui/src/app/metadata-filter/component/search-dialog.component.html
@@ -1,8 +1,8 @@
 <section role="dialog" aria-label="Search filter modal" tabindex="0">
     <div class="modal-header">
         <h4 class="modal-title">
-            <ng-container i18n="@@label--search-entity-id">Search Entity Id ({{ source }})</ng-container>
-            
+            <ng-container i18n="@@label--search-entity-id">Search Entity Id</ng-container>
+             ({{ source }})
         </h4>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close modal" (click)="activeModal.dismiss()">
             <span aria-hidden="true">&times;</span>
diff --git a/ui/src/locale/en.xlf b/ui/src/locale/en.xlf
index a966da2fe..ae6e8359d 100644
--- a/ui/src/locale/en.xlf
+++ b/ui/src/locale/en.xlf
@@ -2059,14 +2059,55 @@
           <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="label--search-entity-id" datatype="html">
-        <source>Search Entity Id (<x id="INTERPOLATION" equiv-text="{{ source }}"/>)</source>
-        <target>Search Entity Id (<x id="INTERPOLATION" equiv-text="{{ source }}"/>)</target>
+      <trans-unit id="message--entity-id-not-found" datatype="html">
+        <source>Entity ID not found</source>
+        <target>Entity ID not found</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/metadata-filter/component/search-dialog.component.ts</context>
-          <context context-type="linenumber">35</context>
+          <context context-type="sourcefile">app/metadata-filter/component/filter-form.component.ts</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="label--xml-preview" datatype="html">
+        <source>Entity ID XML Preview (read-only)</source>
+        <target>Entity ID XML Preview (read-only)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/metadata-filter/component/filter-form.component.ts</context>
+          <context context-type="linenumber">93</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="tooltip--xml-preview" datatype="html">
+        <source>XML Preview</source>
+        <target>XML Preview</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/metadata-filter/component/filter-form.component.ts</context>
+          <context context-type="linenumber">99</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="label--enable-this-filter" datatype="html">
+        <source>Enable this filter?</source>
+        <target>Enable this filter?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/metadata-filter/component/filter-form.component.ts</context>
+          <context context-type="linenumber">123</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="tooltip--enable-this-filter-upon-saving" datatype="html">
+        <source>Enable this filter upon saving popover</source>
+        <target>Enable this filter upon saving popover</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/metadata-filter/component/filter-form.component.ts</context>
+          <context context-type="linenumber">126</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="label--preview-filter" datatype="html">
+        <source>Preview Filter XML</source>
+        <target>Preview Filter XML</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/metadata-filter/component/preview-filter.component.ts</context>
+          <context context-type="linenumber">3</context>
         </context-group>
       </trans-unit>
+      
     </body>
   </file>
 </xliff>
diff --git a/ui/src/locale/es.xlf b/ui/src/locale/es.xlf
index 6ddf4cb2e..0a5d1408c 100644
--- a/ui/src/locale/es.xlf
+++ b/ui/src/locale/es.xlf
@@ -2055,12 +2055,52 @@
           <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="label--search-entity-id" datatype="html">
-        <source>Search Entity Id (<x id="INTERPOLATION" equiv-text="{{ source }}"/>)</source>
-        <target>Search Entity Id (<x id="INTERPOLATION" equiv-text="{{ source }}"/>) (es)</target>
+      <trans-unit id="message--entity-id-not-found" datatype="html">
+        <source>Entity ID not found</source>
+        <target>Entity ID not found (es)</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/metadata-filter/component/search-dialog.component.ts</context>
-          <context context-type="linenumber">35</context>
+          <context context-type="sourcefile">app/metadata-filter/component/filter-form.component.ts</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="label--xml-preview" datatype="html">
+        <source>Entity ID XML Preview (read-only)</source>
+        <target>Entity ID XML Preview (read-only) (es)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/metadata-filter/component/filter-form.component.ts</context>
+          <context context-type="linenumber">93</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="tooltip--xml-preview" datatype="html">
+        <source>XML Preview</source>
+        <target>XML Preview (es)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/metadata-filter/component/filter-form.component.ts</context>
+          <context context-type="linenumber">99</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="label--enable-this-filter" datatype="html">
+        <source>Enable this filter?</source>
+        <target>Enable this filter? (es)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/metadata-filter/component/filter-form.component.ts</context>
+          <context context-type="linenumber">123</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="tooltip--enable-this-filter-upon-saving" datatype="html">
+        <source>Enable this filter upon saving popover</source>
+        <target>Enable this filter upon saving popover (es)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/metadata-filter/component/filter-form.component.ts</context>
+          <context context-type="linenumber">126</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="label--preview-filter" datatype="html">
+        <source>Preview Filter XML</source>
+        <target>Preview Filter XML (es)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/metadata-filter/component/preview-filter.component.ts</context>
+          <context context-type="linenumber">3</context>
         </context-group>
       </trans-unit>
     </body>