diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
index 0eef646220..15fa0ffa8e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
@@ -14,7 +14,7 @@ import {
   DynamicEditorModel,
   DynamicFileUploadModel,
   DynamicFormArrayModel,
-  DynamicFormControlModel, DynamicFormControlRelation,
+  DynamicFormControlModel,
   DynamicFormGroupModel,
   DynamicFormsCoreModule,
   DynamicFormService,
diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
index 6a3b659bff..ecc10b7ab1 100644
--- a/src/app/shared/form/builder/form-builder.service.ts
+++ b/src/app/shared/form/builder/form-builder.service.ts
@@ -73,7 +73,7 @@ export class FormBuilderService extends DynamicFormService {
     this.formModels = new Map();
     this.formGroups = new Map();
     // Replace . with _ in configured type field here, to make configuration more simple and user-friendly
-    this.typeField = environment.submission.typeBind.field.replace('\.', '_');
+    this.typeField = environment.submission.typeBind.field.replace(/\./g, '_');
   }
 
   createDynamicFormControlEvent(control: FormControl, group: FormGroup, model: DynamicFormControlModel, type: string): DynamicFormControlEvent {
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
index 6e1c03efe0..c8b8e07bad 100644
--- a/src/app/shared/form/builder/parsers/field-parser.ts
+++ b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -40,7 +40,7 @@ export abstract class FieldParser {
     @Inject(PARSER_OPTIONS) protected parserOptions: ParserOptions
   ) {
     // Replace . with _ in configured type field here, to make configuration more simple and user-friendly
-    this.typeField = environment.submission.typeBind.field.replace('\.', '_');
+    this.typeField = environment.submission.typeBind.field.replace(/\./g, '_');
   }
 
   public abstract modelFactory(fieldValue?: FormFieldMetadataValueObject, label?: boolean): any;
diff --git a/src/app/shared/mocks/form-builder-service.mock.ts b/src/app/shared/mocks/form-builder-service.mock.ts
index 40d10bc170..6344ac6a6f 100644
--- a/src/app/shared/mocks/form-builder-service.mock.ts
+++ b/src/app/shared/mocks/form-builder-service.mock.ts
@@ -4,26 +4,6 @@ import {DsDynamicInputModel} from '../form/builder/ds-dynamic-form-ui/models/ds-
 
 export function getMockFormBuilderService(): FormBuilderService {
 
-  const inputWithTypeBindConfig = {
-    name: 'testWithTypeBind',
-    id: 'testWithTypeBind',
-    readOnly: false,
-    disabled: false,
-    repeatable: false,
-    value: {
-      value: 'testWithTypeBind',
-      display: 'testWithTypeBind'
-    },
-    submissionId: '1234',
-    metadataFields: [],
-    hasSelectableMetadata: false,
-    typeBindRelations: [
-      {match: 'VISIBLE', operator: 'OR', when: [{'id': 'dc.type', 'value': 'boundType'}]}
-    ]
-  };
-
-  const thing = new DsDynamicInputModel(inputWithTypeBindConfig);
-
   return jasmine.createSpyObj('FormBuilderService', {
     modelFromConfiguration: [],
     createFormGroup: new FormGroup({}),
@@ -55,7 +35,7 @@ export function getMockFormBuilderService(): FormBuilderService {
         metadataFields: ['dc.type'],
         hasSelectableMetadata: false,
         typeBindRelations: [
-          {match: 'VISIBLE', operator: 'OR', when: [{'id': 'dc.type', 'value': 'boundType'}]}
+          {match: 'VISIBLE', operator: 'OR', when: [{id: 'dc.type', value: 'boundType'}]}
         ]
       }
     )