diff --git a/dmp-admin/src/app/compositefield-form/compositefield-form.component.ts b/dmp-admin/src/app/compositefield-form/compositefield-form.component.ts
index 20537346a..c7f8345da 100644
--- a/dmp-admin/src/app/compositefield-form/compositefield-form.component.ts
+++ b/dmp-admin/src/app/compositefield-form/compositefield-form.component.ts
@@ -22,6 +22,9 @@ export class CompositeFieldFormComponent {
 
   ngOnInit() {
     //this.addNewField();
+    if(this.form.get("multiplicity"))
+     if (this.form.get("multiplicity").value.min >1 || this.form.get("multiplicity").value.max >1 )
+       this.isMultiplicityEnabled= true;
     this.isComposite = this.dataModel.fields.length > 1;
   }
 
diff --git a/dmp-admin/src/app/field-form/field-form.component.ts b/dmp-admin/src/app/field-form/field-form.component.ts
index d2ace461a..bb07b5f19 100644
--- a/dmp-admin/src/app/field-form/field-form.component.ts
+++ b/dmp-admin/src/app/field-form/field-form.component.ts
@@ -23,6 +23,9 @@ export class FieldFormComponent {
   constructon() { }
 
   ngOnInit() {
+    if(this.form.get("multiplicity"))
+       if (this.form.get("multiplicity").value.min >1 || this.form.get("multiplicity").value.max >1)
+        this.isFieldMultiplicityEnabled = true;
     // this.addNewRule();
   }
 
diff --git a/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.html b/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.html
index d77f30899..1927f61f0 100644
--- a/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.html
+++ b/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.html
@@ -2,7 +2,7 @@
 
 
     <df-field *ngIf="compositeField.fields.length == 1" [field]="compositeField.fields[0]" [form]="form.get('fields').get(''+0)"
-         [pathName]="pathName+'.fields.'+0"></df-field>
+        [pathName]="pathName+'.fields.'+0"></df-field>
 
     <div *ngIf="compositeField.fields.length > 1" class="fieldset-component">
         <h4 *ngIf="compositeField.title">{{compositeField.title}}</h4>
@@ -12,15 +12,17 @@
                 <i>{{compositeField.extendedDescription}}</i>
             </h4>
             <div *ngFor="let field of compositeField.fields; let i = index;">
-                <div *ngIf="(field?.multiplicity?.max - 1) > (field?.multiplicityItems?.length)">
-                    <a (click)="addMultipleField(i)" style="cursor: pointer">
-                        Add one more field +
-                    </a>
+                <div *ngIf="visibilityRulesService.isElementVisible(null,field.id)">
+                    <div *ngIf="(field?.multiplicity?.max - 1) > (field?.multiplicityItems?.length)">
+                        <a (click)="addMultipleField(i)" style="cursor: pointer">
+                            Add one more field +
+                        </a>
+                    </div>
                 </div>
-                <df-field [field]="field" [form]="form.get('fields').get(''+i)"  [pathName]="pathName+'.fields.'+i"></df-field>
+
+                <df-field [field]="field" [form]="form.get('fields').get(''+i)" [pathName]="pathName+'.fields.'+i"></df-field>
                 <div *ngFor="let multipleField of field.multiplicityItems; let j = index;">
-                    <df-field [field]="multipleField" [form]="form.get('fields').get(''+i).get('multiplicityItems').get(''+j)" 
-                        [pathName]="pathName+'.fields.'+i+'.multiplicityItems.'+j"></df-field>
+                    <df-field [field]="multipleField" [form]="form.get('fields').get(''+i).get('multiplicityItems').get(''+j)" [pathName]="pathName+'.fields.'+i+'.multiplicityItems.'+j"></df-field>
                 </div>
             </div>
         </div>
diff --git a/dmp-frontend/src/app/form/dynamic-form-group/dynamic-form-group.component.html b/dmp-frontend/src/app/form/dynamic-form-group/dynamic-form-group.component.html
index cd2a5fcb0..d202b56e9 100644
--- a/dmp-frontend/src/app/form/dynamic-form-group/dynamic-form-group.component.html
+++ b/dmp-frontend/src/app/form/dynamic-form-group/dynamic-form-group.component.html
@@ -9,7 +9,7 @@
             <div *ngIf="visibilityRulesService.isElementVisible(null,compositeField.id)">
                 <div *ngIf="(compositeField?.multiplicity?.max - 1) > (compositeField?.multiplicityItems?.length)">
                     <a (click)="addMultipleField(i)" style="cursor: pointer">
-                        Add one more field +
+                        Add one more fieldset +
                     </a>
                 </div>
             </div>
diff --git a/dmp-frontend/src/app/services/rest-base.ts b/dmp-frontend/src/app/services/rest-base.ts
index b0210c108..868eeab67 100644
--- a/dmp-frontend/src/app/services/rest-base.ts
+++ b/dmp-frontend/src/app/services/rest-base.ts
@@ -18,7 +18,7 @@ export class RestBase {
     
 
     protocol: string = "http";
-    hostname: string ="localhost"
+    hostname: string ="192.168.32.103"
     port: number = 8080;
     webappname: string = "dmp-backend";