diff --git a/ui-ngx/src/app/modules/home/components/widget/action/custom-sample-css.raw b/ui-ngx/src/app/modules/home/components/widget/action/custom-sample-css.raw
index a8c69855c7..1f1de13677 100644
--- a/ui-ngx/src/app/modules/home/components/widget/action/custom-sample-css.raw
+++ b/ui-ngx/src/app/modules/home/components/widget/action/custom-sample-css.raw
@@ -9,7 +9,6 @@
 }
 
 .edit-entity-form .boolean-value-input .checkbox-label {
-    margin-bottom: 8px;
     color: rgba(0,0,0,0.54);
     font-size: 12px;
 }
@@ -61,7 +60,6 @@
 }
 
 .add-entity-form .boolean-value-input .checkbox-label {
-    margin-bottom: 8px;
     color: rgba(0,0,0,0.54);
     font-size: 12px;
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/action/custom-sample-html.raw b/ui-ngx/src/app/modules/home/components/widget/action/custom-sample-html.raw
index f42fcd5813..95e11ccef6 100644
--- a/ui-ngx/src/app/modules/home/components/widget/action/custom-sample-html.raw
+++ b/ui-ngx/src/app/modules/home/components/widget/action/custom-sample-html.raw
@@ -111,7 +111,7 @@
 <!--                            <button mat-icon-button color="primary"-->
 <!--                                    aria-label="Remove"-->
 <!--                                    type="button"-->
-<!--                                    (click)="removeOldRelation(i)"-->
+<!--                                    (click)="removeOldRelation(i, relation.value)"-->
 <!--                                    matTooltip="Remove relation"-->
 <!--                                    matTooltipPosition="above">-->
 <!--                                <mat-icon>close</mat-icon>-->
diff --git a/ui-ngx/src/app/modules/home/components/widget/action/custom-sample-js.raw b/ui-ngx/src/app/modules/home/components/widget/action/custom-sample-js.raw
index 96dc54d998..30e25a0a5b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/action/custom-sample-js.raw
+++ b/ui-ngx/src/app/modules/home/components/widget/action/custom-sample-js.raw
@@ -136,9 +136,9 @@
 //        vm.relations().markAsDirty();
 //    };
 //
-//    vm.removeOldRelation = function(index) {
+//    vm.removeOldRelation = function(index, relation) {
 //        vm.oldRelations().removeAt(index);
-//        vm.relationsToDelete.push(vm.oldRelationsData[index]);
+//        vm.relationsToDelete.push(relation);
 //        vm.oldRelations().markAsDirty();
 //    };
 //
diff --git a/ui-ngx/src/assets/help/en_US/widget/action/examples/custom_pretty_create_dialog_html.md b/ui-ngx/src/assets/help/en_US/widget/action/examples/custom_pretty_create_dialog_html.md
index 567e093c76..e9a2a90ef7 100644
--- a/ui-ngx/src/assets/help/en_US/widget/action/examples/custom_pretty_create_dialog_html.md
+++ b/ui-ngx/src/assets/help/en_US/widget/action/examples/custom_pretty_create_dialog_html.md
@@ -82,7 +82,7 @@
         <div class="boolean-value-input" fxLayout="column" fxLayoutAlign="center start" fxFlex>
           <label class="checkbox-label">Boolean Value</label>
           <mat-checkbox formControlName="booleanValue" style="margin-bottom: 40px;">
-
+            {{ (addEntityFormGroup.get('attributes.booleanValue').value ? "value.true" : "value.false") | translate }}
           </mat-checkbox>
         </div>
       </div>
@@ -98,7 +98,7 @@
                   <mat-label>Direction</mat-label>
                   <mat-select formControlName="direction" name="direction">
                     <mat-option *ngFor="let direction of entitySearchDirection | keyvalue" [value]="direction.value">
-
+                      {{ ("relation.search-direction." + direction.value) | translate}}
                     </mat-option>
                   </mat-select>
                   <mat-error *ngIf="relation.get('direction').hasError('required')">
diff --git a/ui-ngx/src/assets/help/en_US/widget/action/examples/custom_pretty_edit_dialog_html.md b/ui-ngx/src/assets/help/en_US/widget/action/examples/custom_pretty_edit_dialog_html.md
index 4e3cd0c608..e2f4f531bc 100644
--- a/ui-ngx/src/assets/help/en_US/widget/action/examples/custom_pretty_edit_dialog_html.md
+++ b/ui-ngx/src/assets/help/en_US/widget/action/examples/custom_pretty_edit_dialog_html.md
@@ -5,7 +5,7 @@
 <form #editEntityForm="ngForm" [formGroup]="editEntityFormGroup"
       (ngSubmit)="save()"  class="edit-entity-form">
   <mat-toolbar fxLayout="row" color="primary">
-    <h2>Edit  </h2>
+    <h2>Edit {{entityType.toLowerCase()}} {{entityName}}</h2>
     <span fxFlex></span>
     <button mat-icon-button (click)="cancel()" type="button">
       <mat-icon class="material-icons">close</mat-icon>
@@ -67,7 +67,7 @@
         <div class="boolean-value-input" fxLayout="column" fxLayoutAlign="center start" fxFlex>
           <label class="checkbox-label">Boolean Value</label>
           <mat-checkbox formControlName="booleanValue" style="margin-bottom: 40px;">
-
+            {{ (editEntityFormGroup.get('attributes.booleanValue').value ? "value.true" : "value.false") | translate }}
           </mat-checkbox>
         </div>
       </div>
@@ -84,7 +84,7 @@
                   <mat-label>Direction</mat-label>
                   <mat-select formControlName="direction" name="direction">
                     <mat-option *ngFor="let direction of entitySearchDirection | keyvalue" [value]="direction.value">
-
+                      {{ ("relation.search-direction." + direction.value) | translate}}
                     </mat-option>
                   </mat-select>
                   <mat-error *ngIf="relation.get('direction').hasError('required')">
@@ -109,7 +109,7 @@
               <button mat-icon-button color="primary"
                       aria-label="Remove"
                       type="button"
-                      (click)="removeOldRelation(i)"
+                      (click)="removeOldRelation(i, relation.value)"
                       matTooltip="Remove relation"
                       matTooltipPosition="above">
                 <mat-icon>close</mat-icon>
@@ -130,7 +130,7 @@
                   <mat-label>Direction</mat-label>
                   <mat-select formControlName="direction" name="direction">
                     <mat-option *ngFor="let direction of entitySearchDirection | keyvalue" [value]="direction.value">
-
+                      {{ ("relation.search-direction." + direction.value) | translate}}
                     </mat-option>
                   </mat-select>
                   <mat-error *ngIf="relation.get('direction').hasError('required')">
diff --git a/ui-ngx/src/assets/help/en_US/widget/action/examples/custom_pretty_edit_dialog_js.md b/ui-ngx/src/assets/help/en_US/widget/action/examples/custom_pretty_edit_dialog_js.md
index b2a6a635df..ab3ac8ac50 100644
--- a/ui-ngx/src/assets/help/en_US/widget/action/examples/custom_pretty_edit_dialog_js.md
+++ b/ui-ngx/src/assets/help/en_US/widget/action/examples/custom_pretty_edit_dialog_js.md
@@ -82,9 +82,9 @@ function EditEntityDialogController(instance) {
     vm.relations().markAsDirty();
   };
 
-  vm.removeOldRelation = function(index) {
+  vm.removeOldRelation = function(index, relation) {
     vm.oldRelations().removeAt(index);
-    vm.relationsToDelete.push(vm.oldRelationsData[index]);
+    vm.relationsToDelete.push(relation);
     vm.oldRelations().markAsDirty();
   };
 
diff --git a/ui-ngx/src/assets/help/en_US/widget/action/examples_custom_pretty/custom_pretty_create_dialog_html.md b/ui-ngx/src/assets/help/en_US/widget/action/examples_custom_pretty/custom_pretty_create_dialog_html.md
index 567e093c76..e9a2a90ef7 100644
--- a/ui-ngx/src/assets/help/en_US/widget/action/examples_custom_pretty/custom_pretty_create_dialog_html.md
+++ b/ui-ngx/src/assets/help/en_US/widget/action/examples_custom_pretty/custom_pretty_create_dialog_html.md
@@ -82,7 +82,7 @@
         <div class="boolean-value-input" fxLayout="column" fxLayoutAlign="center start" fxFlex>
           <label class="checkbox-label">Boolean Value</label>
           <mat-checkbox formControlName="booleanValue" style="margin-bottom: 40px;">
-
+            {{ (addEntityFormGroup.get('attributes.booleanValue').value ? "value.true" : "value.false") | translate }}
           </mat-checkbox>
         </div>
       </div>
@@ -98,7 +98,7 @@
                   <mat-label>Direction</mat-label>
                   <mat-select formControlName="direction" name="direction">
                     <mat-option *ngFor="let direction of entitySearchDirection | keyvalue" [value]="direction.value">
-
+                      {{ ("relation.search-direction." + direction.value) | translate}}
                     </mat-option>
                   </mat-select>
                   <mat-error *ngIf="relation.get('direction').hasError('required')">
diff --git a/ui-ngx/src/assets/help/en_US/widget/action/examples_custom_pretty/custom_pretty_edit_dialog_html.md b/ui-ngx/src/assets/help/en_US/widget/action/examples_custom_pretty/custom_pretty_edit_dialog_html.md
index 4e3cd0c608..05f494666f 100644
--- a/ui-ngx/src/assets/help/en_US/widget/action/examples_custom_pretty/custom_pretty_edit_dialog_html.md
+++ b/ui-ngx/src/assets/help/en_US/widget/action/examples_custom_pretty/custom_pretty_edit_dialog_html.md
@@ -5,7 +5,7 @@
 <form #editEntityForm="ngForm" [formGroup]="editEntityFormGroup"
       (ngSubmit)="save()"  class="edit-entity-form">
   <mat-toolbar fxLayout="row" color="primary">
-    <h2>Edit  </h2>
+    <h2>Edit {{entityType.toLowerCase()}} {{entityName}}</h2>
     <span fxFlex></span>
     <button mat-icon-button (click)="cancel()" type="button">
       <mat-icon class="material-icons">close</mat-icon>
@@ -67,7 +67,7 @@
         <div class="boolean-value-input" fxLayout="column" fxLayoutAlign="center start" fxFlex>
           <label class="checkbox-label">Boolean Value</label>
           <mat-checkbox formControlName="booleanValue" style="margin-bottom: 40px;">
-
+            {{ (editEntityFormGroup.get('attributes.booleanValue').value ? "value.true" : "value.false") | translate }}
           </mat-checkbox>
         </div>
       </div>
@@ -84,7 +84,7 @@
                   <mat-label>Direction</mat-label>
                   <mat-select formControlName="direction" name="direction">
                     <mat-option *ngFor="let direction of entitySearchDirection | keyvalue" [value]="direction.value">
-
+                      {{ ("relation.search-direction." + direction.value) | translate}}
                     </mat-option>
                   </mat-select>
                   <mat-error *ngIf="relation.get('direction').hasError('required')">
@@ -109,7 +109,7 @@
               <button mat-icon-button color="primary"
                       aria-label="Remove"
                       type="button"
-                      (click)="removeOldRelation(i)"
+                      (click)="removeOldRelation(i, relation.value)"
                       matTooltip="Remove relation"
                       matTooltipPosition="above">
                 <mat-icon>close</mat-icon>
@@ -130,7 +130,7 @@
                   <mat-label>Direction</mat-label>
                   <mat-select formControlName="direction" name="direction">
                     <mat-option *ngFor="let direction of entitySearchDirection | keyvalue" [value]="direction.value">
-
+                        {{ ("relation.search-direction." + direction.value) | translate}}
                     </mat-option>
                   </mat-select>
                   <mat-error *ngIf="relation.get('direction').hasError('required')">
diff --git a/ui-ngx/src/assets/help/en_US/widget/action/examples_custom_pretty/custom_pretty_edit_dialog_js.md b/ui-ngx/src/assets/help/en_US/widget/action/examples_custom_pretty/custom_pretty_edit_dialog_js.md
index b2a6a635df..ab3ac8ac50 100644
--- a/ui-ngx/src/assets/help/en_US/widget/action/examples_custom_pretty/custom_pretty_edit_dialog_js.md
+++ b/ui-ngx/src/assets/help/en_US/widget/action/examples_custom_pretty/custom_pretty_edit_dialog_js.md
@@ -82,9 +82,9 @@ function EditEntityDialogController(instance) {
     vm.relations().markAsDirty();
   };
 
-  vm.removeOldRelation = function(index) {
+  vm.removeOldRelation = function(index, relation) {
     vm.oldRelations().removeAt(index);
-    vm.relationsToDelete.push(vm.oldRelationsData[index]);
+    vm.relationsToDelete.push(relation);
     vm.oldRelations().markAsDirty();
   };