diff --git a/dmp-admin/src/app/autocomplete/autocomplete-component.ts b/dmp-admin/src/app/autocomplete/autocomplete-component.ts
index 2f4c09d74..01c75b904 100644
--- a/dmp-admin/src/app/autocomplete/autocomplete-component.ts
+++ b/dmp-admin/src/app/autocomplete/autocomplete-component.ts
@@ -17,9 +17,8 @@ export class AutocompleteComponent implements OnInit{
     ngOnInit(){
         this.data.type= "autocomplete";
         let autocomplete: AutocompleteData = new AutocompleteData();
-        this.dataModel.data =  new JsonSerializer<AutocompleteData>().fromJSONObject(this.data,AutocompleteData);
-        //(<FormArray>this.form.get("data")).push(autocomplete.buildForm());
-        if (this.form.get("data")) this.form.removeControl("data");
+        //this.dataModel.data =  new JsonSerializer<AutocompleteData>().fromJSONObject(this.data,AutocompleteData);
+        //(<FormArray>this.form.get("data")).push(autocomplete.buildForm());        
         this.form.addControl("data", this.data.buildForm());
     }
 }
\ No newline at end of file
diff --git a/dmp-admin/src/app/combobox/combobox-component.html b/dmp-admin/src/app/combobox/combobox-component.html
index 38f4c9a73..a3eb851a1 100644
--- a/dmp-admin/src/app/combobox/combobox-component.html
+++ b/dmp-admin/src/app/combobox/combobox-component.html
@@ -1,14 +1,14 @@
 <div class="form-group col-md-12">
     <label>Type of Combobox</label>
-    <select class="form-control" [(ngModel)]="dataModel.data!=null?dataModel.data.type:type">
+    <select class="form-control" [(ngModel)]="type" (change)= "onchangeCombo($event)">
         <option *ngFor="let option of options" [value]="option.value">{{option.value}}</option>
     </select>
-    <div class="form-row" [ngSwitch]="dataModel.data!=null?dataModel.data.type:type">
+    <div class="form-row" [ngSwitch]="type">
         <div *ngSwitchCase="'autocomplete'">
             <autocomplete-component [form]="form" [dataModel]="dataModel"></autocomplete-component>
         </div>
     </div>
-    <div class="form-row" [ngSwitch]="dataModel.data!=null?dataModel.data.type:type">
+    <div class="form-row" [ngSwitch]="type">
             <div *ngSwitchCase="'wordlist'">
                 <wordlist-component [form]="form" [dataModel]="dataModel"></wordlist-component>
             </div>
diff --git a/dmp-admin/src/app/combobox/combobox-component.ts b/dmp-admin/src/app/combobox/combobox-component.ts
index abd17c00c..9441f28be 100644
--- a/dmp-admin/src/app/combobox/combobox-component.ts
+++ b/dmp-admin/src/app/combobox/combobox-component.ts
@@ -9,10 +9,17 @@ import { Component, Input, OnInit } from '@angular/core';
 export class ComboboxComponent implements OnInit{
     @Input() dataModel: Field;
     @Input() form: FormGroup;
-
+    type: string;
     options = [{id:"autocomplete", value: "autocomplete"}, {id:"wordlist", value: "wordlist"}];
 
     ngOnInit(){
+        if (this.dataModel.data){
+            this.type = this.form.get("data").get("type").value;
+        }
 
     }
+
+    onchangeCombo(){
+        if (this.form.get("data")) this.form.removeControl("data");
+    }
 }
\ No newline at end of file
diff --git a/dmp-admin/src/app/wordlist/wordlist-component.ts b/dmp-admin/src/app/wordlist/wordlist-component.ts
index 203c8cd6a..5946a083c 100644
--- a/dmp-admin/src/app/wordlist/wordlist-component.ts
+++ b/dmp-admin/src/app/wordlist/wordlist-component.ts
@@ -18,9 +18,10 @@ export class WordlistComponent implements OnInit{
     
     ngOnInit(){  
         this.data.type = "wordlist";
-        if (this.form.get("data")) this.form.removeControl("data");
+       // if (this.form.get("data")) this.form.removeControl("data");
         this.form.addControl("data", this.data.buildForm()); 
-        this.addNewRow();
+        if(!this.dataModel.data)
+            this.addNewRow();
     }
 
     addNewRow(){