diff --git a/ui/src/app/metadata/Filter.js b/ui/src/app/metadata/Filter.js
index 58b867040..4c1bc707c 100644
--- a/ui/src/app/metadata/Filter.js
+++ b/ui/src/app/metadata/Filter.js
@@ -11,8 +11,6 @@ export function Filter() {
 
     const { path, url } = useRouteMatch();
 
-    console.log(path, url)
-
     return (
         <Switch>
             <Route path={`${path}/list`} render={() =>
diff --git a/ui/src/app/metadata/editor/MetadataFilterEditor.js b/ui/src/app/metadata/editor/MetadataFilterEditor.js
index 538c85d0e..972905e0a 100644
--- a/ui/src/app/metadata/editor/MetadataFilterEditor.js
+++ b/ui/src/app/metadata/editor/MetadataFilterEditor.js
@@ -25,6 +25,13 @@ export function MetadataFilterEditor({children, onNavigate, block}) {
     const schema = React.useContext(MetadataSchemaContext);
     const current = React.useContext(MetadataFilterContext);
 
+    React.useEffect(() => {
+        const step = definition.steps.find(step => step.id === section);
+        if (!step) {
+            onNavigate(definition.steps[0].id);
+        }
+    }, [section, current, onNavigate, definition]);
+
     const { state, dispatch } = React.useContext(MetadataFormContext);
     const { metadata, errors } = state;
 
@@ -38,6 +45,7 @@ export function MetadataFilterEditor({children, onNavigate, block}) {
 
     const warnings = definition.warnings && definition.warnings(metadata);
 
+
     return (
         <div className="">
             <div className="row">
diff --git a/ui/src/app/metadata/hooks/schema.js b/ui/src/app/metadata/hooks/schema.js
index 5083559b1..b8bfcf7ca 100644
--- a/ui/src/app/metadata/hooks/schema.js
+++ b/ui/src/app/metadata/hooks/schema.js
@@ -11,7 +11,11 @@ export function useUiSchema(definition, schema, current, locked = true) {
 
     const ui = React.useMemo(() => definition ? { ...definition.uiSchema } : {}, [definition]);
     const schemaKeys = React.useMemo(() => schema ? Object.keys(schema.properties) : [], [schema]);
-    const step = React.useMemo(() => definition ? definition.steps.find(step => step.id === current) : {fields: []}, [definition, current]);
+    let step = React.useMemo(() => definition ? definition.steps.find(step => step.id === current) : {fields: []}, [definition, current]);
+
+    if (!step) {
+        step = definition.steps[0];
+    }
 
     const filled = React.useMemo(() => fillInRootProperties(schemaKeys, ui), [schemaKeys, ui]);
     const mapped = React.useMemo(() => Object.keys(filled).reduce((sch, key) => {
diff --git a/ui/src/app/metadata/wizard/MetadataFilterTypeSelector.js b/ui/src/app/metadata/wizard/MetadataFilterTypeSelector.js
index ff16b61a4..d46e79999 100644
--- a/ui/src/app/metadata/wizard/MetadataFilterTypeSelector.js
+++ b/ui/src/app/metadata/wizard/MetadataFilterTypeSelector.js
@@ -5,7 +5,7 @@ import Translate from '../../i18n/components/translate';
 import { InfoIcon } from '../../form/component/InfoIcon';
 import { useTranslator } from '../../i18n/hooks';
 
-export function MetadataFilterTypeSelector({ types = [], children, actions}) {
+export function MetadataFilterTypeSelector({ types = [], children}) {
 
     const translator = useTranslator();
 
@@ -29,7 +29,7 @@ export function MetadataFilterTypeSelector({ types = [], children, actions}) {
     React.useEffect(() => {
         setBase({
             '@type': type
-        })
+        });
     }, [type])
 
     return (