diff --git a/ui/src/app/metadata/editor/MetadataEditor.js b/ui/src/app/metadata/editor/MetadataEditor.js
index 2561dee47..6918d3627 100644
--- a/ui/src/app/metadata/editor/MetadataEditor.js
+++ b/ui/src/app/metadata/editor/MetadataEditor.js
@@ -49,6 +49,7 @@ export function MetadataEditor ({ restore, current, reload }) {
     function save(metadata) {
         update(`/${id}`, definition.parser(metadata, base))
             .then(() => {
+                notificationDispatch(createNotificationAction('Entity saved'));
                 gotoDetail({ refresh: true });
             })
             .catch((err) => {
@@ -70,9 +71,7 @@ export function MetadataEditor ({ restore, current, reload }) {
 
     const gotoDetail = (state = null) => {
         setBlocking(false);
-        
-        console.log(`/metadata/${type}/${id}`);
-        history.push(`/metadata/${type}/${id}`, state);
+        setTimeout(() => history.push(`/metadata/${type}/${id}`, state) );
     };
 
     const onNavigate = (path) => {
diff --git a/ui/src/app/metadata/new/NewFilter.js b/ui/src/app/metadata/new/NewFilter.js
index 4daec5b69..72da363b9 100644
--- a/ui/src/app/metadata/new/NewFilter.js
+++ b/ui/src/app/metadata/new/NewFilter.js
@@ -39,7 +39,9 @@ export function NewFilter() {
 
     const gotoDetail = (state = null) => {
         setBlocking(false);
-        history.push(`/metadata/provider/${id}`, state);
+        setTimeout(() => {
+            history.push(`/metadata/provider/${id}`, state);
+        });
     };
 
     const onNavigate = (path) => {
diff --git a/ui/src/app/metadata/wizard/MetadataFilterTypeSelector.js b/ui/src/app/metadata/wizard/MetadataFilterTypeSelector.js
index c75f42eb3..09260c018 100644
--- a/ui/src/app/metadata/wizard/MetadataFilterTypeSelector.js
+++ b/ui/src/app/metadata/wizard/MetadataFilterTypeSelector.js
@@ -44,10 +44,13 @@ export function MetadataFilterTypeSelector({ types = [], children, actions}) {
                                         <span><Translate value={'label.metadata-provider-type'} /></span>
                                         <InfoIcon value="tooltip.metadata-provider-type" />
                                     </Form.Label>
-                                    <Form.Control as="select" defaultValue={''} placeholder={translator(`label.select-metadata-type`)} {...register('type', { required: true })}>
+                                    <Form.Select
+                                        defaultValue={''}
+                                        placeholder={translator(`label.select-metadata-type`)}
+                                        {...register('type', { required: true })}>
                                         <option disabled value="">{translator(`label.select-metadata-type`)}</option>
                                         {types.map(t => <option key={t} value={t}>{t}</option>)}
-                                    </Form.Control>
+                                    </Form.Select>
                                 </Form.Group>
                             </Form>
                         </div>