diff --git a/src/app/adf-roles/df-manage-roles/df-manage-roles-table.component.ts b/src/app/adf-roles/df-manage-roles/df-manage-roles-table.component.ts
index d662d409..317592fe 100644
--- a/src/app/adf-roles/df-manage-roles/df-manage-roles-table.component.ts
+++ b/src/app/adf-roles/df-manage-roles/df-manage-roles-table.component.ts
@@ -171,24 +171,28 @@ export class DfManageRolesTableComponent extends DfManageTableComponent<RoleRow>
                   is_active: roleData.isActive || roleData.is_active,
                   // Copy service access permissions - check both camelCase and snake_case
                   role_service_access_by_role_id:
-                    (roleData.roleServiceAccessByRoleId || roleData.role_service_access_by_role_id)?.map(
-                      (access: any) => ({
-                        service_id: access.serviceId || access.service_id,
-                        component: access.component,
-                        verb_mask: access.verbMask || access.verb_mask,
-                        requestor_mask: access.requestorMask || access.requestor_mask,
-                        filters:
-                          access.filters?.map((filter: any) => ({
-                            name: filter.name || filter.field,
-                            operator: filter.operator,
-                            value: filter.value,
-                          })) || [],
-                        filter_op: access.filterOp || access.filter_op || 'AND',
-                      })
-                    ) || [],
+                    (
+                      roleData.roleServiceAccessByRoleId ||
+                      roleData.role_service_access_by_role_id
+                    )?.map((access: any) => ({
+                      service_id: access.serviceId || access.service_id,
+                      component: access.component,
+                      verb_mask: access.verbMask || access.verb_mask,
+                      requestor_mask:
+                        access.requestorMask || access.requestor_mask,
+                      filters:
+                        access.filters?.map((filter: any) => ({
+                          name: filter.name || filter.field,
+                          operator: filter.operator,
+                          value: filter.value,
+                        })) || [],
+                      filter_op: access.filterOp || access.filter_op || 'AND',
+                    })) || [],
                   // Copy lookup keys - check both camelCase and snake_case
                   lookup_by_role_id:
-                    (roleData.lookupByRoleId || roleData.lookup_by_role_id)?.map((lookup: any) => ({
+                    (
+                      roleData.lookupByRoleId || roleData.lookup_by_role_id
+                    )?.map((lookup: any) => ({
                       name: lookup.name,
                       value: lookup.value,
                       private: lookup.private,
@@ -201,7 +205,10 @@ export class DfManageRolesTableComponent extends DfManageTableComponent<RoleRow>
                   resource: [duplicatedRole],
                 };
 
-                console.log('Sending payload:', JSON.stringify(payload, null, 2));
+                console.log(
+                  'Sending payload:',
+                  JSON.stringify(payload, null, 2)
+                );
 
                 // Create the new role
                 this.roleService
diff --git a/src/app/adf-services/df-service-details/df-service-details.component.ts b/src/app/adf-services/df-service-details/df-service-details.component.ts
index e6dfb191..60945c1b 100644
--- a/src/app/adf-services/df-service-details/df-service-details.component.ts
+++ b/src/app/adf-services/df-service-details/df-service-details.component.ts
@@ -197,7 +197,7 @@ export class DfServiceDetailsComponent implements OnInit {
       description: [''],
       isActive: [true],
       service_doc_by_service_id: this.fb.group({
-        format: [],
+        format: [0],
         content: [''],
       }),
     });
@@ -560,9 +560,9 @@ export class DfServiceDetailsComponent implements OnInit {
       //   data.service_doc_by_service_id = null;
       // } else {
       data.service_doc_by_service_id.content = data.config.content;
-      data.service_doc_by_service_id.format = Number(
-        this.serviceDefinitionType
-      );
+      data.service_doc_by_service_id.format = this.serviceDefinitionType
+        ? Number(this.serviceDefinitionType)
+        : 0;
       // }
     } else if (this.isScriptService) {
       params = {