diff --git a/ui/src/app/form/component/templates/FieldTemplate.js b/ui/src/app/form/component/templates/FieldTemplate.js
index e2b2dbe7b..f98078ef9 100644
--- a/ui/src/app/form/component/templates/FieldTemplate.js
+++ b/ui/src/app/form/component/templates/FieldTemplate.js
@@ -19,7 +19,7 @@ export function FieldTemplate ({
 
     return (
         <>{!props.hidden ?
-            <Form.Group className="mb-3">
+            <Form.Group className="mb-3" id={`${id}-group`}>
                 <div>
                     {children}
                 </div>
diff --git a/ui/src/app/metadata/hoc/FilterTargetPreview.js b/ui/src/app/metadata/hoc/FilterTargetPreview.js
index 2fd81e4c3..0e3fe1aab 100644
--- a/ui/src/app/metadata/hoc/FilterTargetPreview.js
+++ b/ui/src/app/metadata/hoc/FilterTargetPreview.js
@@ -35,7 +35,7 @@ export function FilterTargetPreview ({ entityId, children }) {
 
     return (
         <React.Fragment>
-            {children(preview, loading, data)}
+            {data && children(preview, loading, data)}
             <Modal show={show} onHide={handleClose} dialogClassName="modal-xl">
                 <Modal.Header closeButton>
                     <Modal.Title><Translate value="label.preview-provider">Preview XML</Translate></Modal.Title>