diff --git a/ui/src/app/metadata/configuration/container/restore.component.spec.ts b/ui/src/app/metadata/configuration/container/restore.component.spec.ts
index 433a11ebd..e79cbcac9 100644
--- a/ui/src/app/metadata/configuration/container/restore.component.spec.ts
+++ b/ui/src/app/metadata/configuration/container/restore.component.spec.ts
@@ -10,6 +10,7 @@ import * as fromResolvers from '../../resolver/reducer';
 import { MockI18nModule } from '../../../../testing/i18n.stub';
 import { RestoreComponent } from './restore.component';
 import { of } from 'rxjs';
+import { DatePipe } from '@angular/common';
 
 @Component({
     template: `
@@ -44,6 +45,9 @@ describe('Metadata Restore Page Component', () => {
                 RestoreComponent,
                 TestHostComponent
             ],
+            providers: [
+                DatePipe
+            ]
         }).compileComponents();
 
         store = TestBed.get(Store);
diff --git a/ui/src/app/metadata/configuration/effect/restore.effect.ts b/ui/src/app/metadata/configuration/effect/restore.effect.ts
index d91682c61..cfdf45057 100644
--- a/ui/src/app/metadata/configuration/effect/restore.effect.ts
+++ b/ui/src/app/metadata/configuration/effect/restore.effect.ts
@@ -17,6 +17,7 @@ import { Router, ActivatedRoute } from '@angular/router';
 
 import { AddNotification } from '../../../notification/action/notification.action';
 import { Notification, NotificationType } from '../../../notification/model/notification';
+import { removeNulls } from '../../../shared/util';
 
 
 @Injectable()
diff --git a/ui/src/app/metadata/configuration/service/history.service.ts b/ui/src/app/metadata/configuration/service/history.service.ts
index 02529cde5..6a5f79607 100644
--- a/ui/src/app/metadata/configuration/service/history.service.ts
+++ b/ui/src/app/metadata/configuration/service/history.service.ts
@@ -8,6 +8,7 @@ import { MetadataVersion } from '../model/version';
 import { map, catchError, switchMap } from 'rxjs/operators';
 import { Metadata } from '../../domain/domain.type';
 import { withLatestFrom } from 'rxjs-compat/operator/withLatestFrom';
+import { removeNulls } from '../../../shared/util';
 
 @Injectable()
 export class MetadataHistoryService {
@@ -48,7 +49,7 @@ export class MetadataHistoryService {
     restoreVersion(resourceId: string, type: string, versionId: string): Observable<Metadata> {
         return this.getVersions(resourceId, [null, versionId], type).pipe(
             switchMap(([current, toRestore]) =>
-                this.updateVersion(resourceId, type, { ...toRestore, version: current.version })
+                this.updateVersion(resourceId, type, { ...removeNulls(toRestore), version: current.version })
             )
         );
     }
diff --git a/ui/src/app/metadata/filter/effect/collection.effect.ts b/ui/src/app/metadata/filter/effect/collection.effect.ts
index 58ecd41f7..dcf67b246 100644
--- a/ui/src/app/metadata/filter/effect/collection.effect.ts
+++ b/ui/src/app/metadata/filter/effect/collection.effect.ts
@@ -35,8 +35,7 @@ import { FilterCollectionActionTypes } from '../action/collection.action';
 import * as fromFilter from '../reducer';
 import * as fromProvider from '../../provider/reducer';
 import { MetadataFilter } from '../../domain/model';
-import { removeNulls, array_move } from '../../../shared/util';
-import { EntityAttributesFilterEntity } from '../../domain/entity/filter/entity-attributes-filter';
+import { array_move } from '../../../shared/util';
 import { MetadataFilterService } from '../../domain/service/filter.service';
 import { SelectProviderRequest } from '../../provider/action/collection.action';
 import { UpdateFilterChanges, ClearFilter } from '../action/filter.action';
diff --git a/ui/src/app/metadata/filter/model/entity-attributes-configuration.filter.ts b/ui/src/app/metadata/filter/model/entity-attributes-configuration.filter.ts
index 5333e08f1..06a6609b6 100644
--- a/ui/src/app/metadata/filter/model/entity-attributes-configuration.filter.ts
+++ b/ui/src/app/metadata/filter/model/entity-attributes-configuration.filter.ts
@@ -1,6 +1,5 @@
 import { Wizard } from '../../../wizard/model';
 import { MetadataFilter } from '../../domain/model';
-import { removeNulls } from '../../../shared/util';
 import { EntityAttributesFilter } from './entity-attributes.filter';
 
 export const EntityAttributesFilterConfiguration: Wizard<MetadataFilter> = {
diff --git a/ui/src/app/schema-form/service/schema.service.ts b/ui/src/app/schema-form/service/schema.service.ts
index 617769de6..0e5905a8a 100644
--- a/ui/src/app/schema-form/service/schema.service.ts
+++ b/ui/src/app/schema-form/service/schema.service.ts
@@ -28,12 +28,13 @@ export class SchemaService {
             const conditions = formProperty.parent.schema.anyOf || [];
             const values = formProperty.parent.value;
             const currentConditions = conditions.filter(condition =>
-                Object
+                'properties' in condition ? Object
                     .keys(condition.properties)
                     .some(
                         key => values.hasOwnProperty(key) && condition.properties[key].enum ?
                             condition.properties[key].enum[0] === values[key] : false
                     )
+                : false
             );
             currentConditions.forEach(el => {
                 requiredFields = el.required || [];