diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue
index df592675..6e3051d3 100644
--- a/src/pages/03_customer-management/MainPage.vue
+++ b/src/pages/03_customer-management/MainPage.vue
@@ -642,8 +642,8 @@ const emptyCreateDialog = ref(false);
                     ? customerStats.map((v) => ({
                         count:
                           v.name === 'CORP'
-                            ? statsCustomerType?.CORP ?? 0
-                            : statsCustomerType?.PERS ?? 0,
+                            ? (statsCustomerType?.CORP ?? 0)
+                            : (statsCustomerType?.PERS ?? 0),
                         label:
                           v.name === 'CORP'
                             ? 'customerLegalEntity'
@@ -969,6 +969,17 @@ const emptyCreateDialog = ref(false);
                             : ''
                         "
                       >
+                        <q-td
+                          class="text-center"
+                          v-if="fieldSelected.includes('orderNumber')"
+                        >
+                          {{
+                            (currentPageCustomer - 1) * pageSize +
+                            props.rowIndex +
+                            1
+                          }}
+                        </q-td>
+
                         <q-td v-if="fieldSelected.includes('customerName')">
                           <div class="row items-center">
                             <div
@@ -996,37 +1007,36 @@ const emptyCreateDialog = ref(false);
                             </div>
                             <div class="col">
                               <div class="col">
-                                {{ props.row.customerName || '-' }}
+                                {{ props.row.firstName || '-' }}
+                                {{ props.row.lastName || '-' }}
                               </div>
                               <div class="col app-text-muted">
-                                {{ props.row.customerNameEN || '-' }}
+                                {{ props.row.firstNameEN || '-' }}
+                                {{ props.row.lastNameEN || '-' }}
                               </div>
                             </div>
                           </div>
                         </q-td>
-                        <q-td v-if="fieldSelected.includes('type')">
-                          <span
-                            class="tags"
-                            :class="{
-                              [`tags__${props.row.customerType === 'CORP' ? 'purple' : 'green'}`]: true,
-                            }"
-                          >
-                            {{
-                              props.row.customerType === 'CORP'
-                                ? $t('customerLegalEntity')
-                                : $t('customerNaturalPerson')
-                            }}
-                          </span>
+                        <q-td v-if="fieldSelected.includes('businessTypePure')">
+                          {{ props.row.businessTypePure || '-' }}
                         </q-td>
-                        <q-td v-if="fieldSelected.includes('personName')">
-                          {{ props.row.personName }}
+
+                        <q-td v-if="fieldSelected.includes('address')">
+                          {{ props.row.branch?.[0].address || '-' }}
                         </q-td>
-                        <q-td v-if="fieldSelected.includes('telephoneNo')">
-                          {{ props.row.branch[0]?.telephoneNo || '-' }}
+
+                        <q-td v-if="fieldSelected.includes('workPlace')">
+                          {{ props.row.branch?.[0].workplace || '-' }}
                         </q-td>
-                        <q-td v-if="fieldSelected.includes('branchEmail')">
-                          {{ props.row.branch[0]?.email || '-' }}
+
+                        <q-td v-if="fieldSelected.includes('contactName')">
+                          {{ props.row.branch?.[0].contactName || '-' }}
                         </q-td>
+
+                        <q-td v-if="fieldSelected.includes('contactPhone')">
+                          {{ props.row.branch?.[0].telephoneNo || '-' }}
+                        </q-td>
+
                         <q-td>
                           <q-btn
                             dense