diff --git a/ui/src/app/dashboard/component/Ordered.js b/ui/src/app/dashboard/component/Ordered.js
index 117e28eed..80d8743fb 100644
--- a/ui/src/app/dashboard/component/Ordered.js
+++ b/ui/src/app/dashboard/component/Ordered.js
@@ -10,6 +10,9 @@ export const getId = (entity) => {
 };
 
 export const mergeOrderFn = (entities, order) => {
+    if (!entities) {
+        return [];
+    }
     const ordered = [...entities.sort(
         (a, b) => {
             const aIndex = order.indexOf(getId(a));
diff --git a/ui/src/app/metadata/component/MetadataConfiguration.js b/ui/src/app/metadata/component/MetadataConfiguration.js
index 4faff19af..f62e5e0c0 100644
--- a/ui/src/app/metadata/component/MetadataConfiguration.js
+++ b/ui/src/app/metadata/component/MetadataConfiguration.js
@@ -18,7 +18,7 @@ export function MetadataConfiguration ({ configuration }) {
     return (
         <>
             { configuration && configuration.sections.map((section, sidx) =>
-                <>
+                <React.Fragment key={sidx}>
                     {section?.properties?.length > 0 && 
                     <MetadataSection section={section} key={sidx} index={ sidx } onEdit={editable ? onEdit : null}>
                         <div className="d-flex border-bottom border-light border-2 py-2">
@@ -36,7 +36,7 @@ export function MetadataConfiguration ({ configuration }) {
                         <ObjectProperty property={section} columns={columns}></ObjectProperty>
                     </MetadataSection>
                     }
-                </>
+                </React.Fragment>
             ) }
         </>
     );
diff --git a/ui/src/app/metadata/domain/filter/component/MetadataFilters.js b/ui/src/app/metadata/domain/filter/component/MetadataFilters.js
index b30e38436..53a00461e 100644
--- a/ui/src/app/metadata/domain/filter/component/MetadataFilters.js
+++ b/ui/src/app/metadata/domain/filter/component/MetadataFilters.js
@@ -18,15 +18,15 @@ export function MetadataFilters ({ providerId, types = [], filters, children })
 
     /*eslint-disable react-hooks/exhaustive-deps*/
     React.useEffect(() => {
-        if (!filters) {
+        if (!filterData) {
             loadFilters(providerId);
         } else {
-            setFilterData(filters);
+            setFilterData(filterData);
         }
     }, [providerId]);
 
 
     return (
-        <MetadataFiltersContext.Provider value={filters}>{children}</MetadataFiltersContext.Provider>
+        <MetadataFiltersContext.Provider value={filterData}>{children}</MetadataFiltersContext.Provider>
     );
 }
\ No newline at end of file
diff --git a/ui/src/app/metadata/view/MetadataHistory.js b/ui/src/app/metadata/view/MetadataHistory.js
index 605b506ed..27095dae3 100644
--- a/ui/src/app/metadata/view/MetadataHistory.js
+++ b/ui/src/app/metadata/view/MetadataHistory.js
@@ -74,7 +74,7 @@ export function MetadataHistory () {
                                     </div>
                                 </td>
                                 <td>
-                                    {i === 0 ? <Link to="['../', 'options']">
+                                    {i === 0 ? <Link to={`/metadata/${type}/${id}/configuration/options` }>
                                         <FormattedDate time={true} date={version.date} />&nbsp;(<Translate value="label.current">Current</Translate>)
                                     </Link>
                                     :
diff --git a/ui/src/setupProxy.js b/ui/src/setupProxy.js
index 78c38f7fb..bbd4523b8 100644
--- a/ui/src/setupProxy.js
+++ b/ui/src/setupProxy.js
@@ -3,7 +3,7 @@ const { createProxyMiddleware } = require('http-proxy-middleware');
 
 module.exports = function (app) {
 
-    const port = 10101;
+    const port = 8080;
 
     app.use(
         '/api',