diff --git a/ayanova/src/views/adm-global-settings.vue b/ayanova/src/views/adm-global-settings.vue
index b55807b8..06620471 100644
--- a/ayanova/src/views/adm-global-settings.vue
+++ b/ayanova/src/views/adm-global-settings.vue
@@ -284,19 +284,6 @@
                         @change="fieldValueChanged('customerAllowViewWO')"
                       ></v-checkbox>
                     </v-col>
-                    <!-- <v-col cols="12" sm="6" lg="5">
-                      <gz-tag-picker
-                        v-model="obj.customerAllowViewWOInTags"
-                        :readonly="formState.readOnly"
-                        :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
-                        ref="customerAllowViewWOInTags"
-                        data-cy="customerAllowViewWOInTags"
-                        :error-messages="
-                          form().serverErrors(this, 'customerAllowViewWOInTags')
-                        "
-                        @input="fieldValueChanged('customerAllowViewWOInTags')"
-                      ></gz-tag-picker>
-                    </v-col> -->
 
                     <v-col cols="12" sm="6" lg="10">
                       <gz-pick-list
@@ -305,7 +292,7 @@
                         show-edit-icon
                         v-model="obj.customerDefaultWorkOrderReportId"
                         :readonly="formState.readOnly"
-                        :label="$ay.t('DefaultCustomerAccessWorkOrderReport')"
+                        :label="$ay.t('DefaultReport')"
                         ref="customerDefaultWorkOrderReportId"
                         data-cy="customerDefaultWorkOrderReportId"
                         :error-messages="
@@ -320,11 +307,12 @@
                       ></gz-pick-list>
                     </v-col>
 
+                    <!-- ------------ -->
                     <v-col cols="12" sm="6">
                       <gz-tag-picker
                         v-model="obj.customerWorkOrderReport1Tags"
                         :readonly="formState.readOnly"
-                        :label="$ay.t('TaggedWith')"
+                        :label="$ay.t('CustomerTaggedWith')"
                         ref="customerWorkOrderReport1Tags"
                         data-cy="customerWorkOrderReport1Tags"
                         :error-messages="
@@ -360,6 +348,174 @@
                         "
                       ></gz-pick-list>
                     </v-col>
+
+                    <!-- ------------ -->
+                    <v-col cols="12" sm="6">
+                      <gz-tag-picker
+                        v-model="obj.customerWorkOrderReport2Tags"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('CustomerTaggedWith')"
+                        ref="customerWorkOrderReport2Tags"
+                        data-cy="customerWorkOrderReport2Tags"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerWorkOrderReport2Tags'
+                          )
+                        "
+                        @input="
+                          fieldValueChanged('customerWorkOrderReport2Tags')
+                        "
+                      ></gz-tag-picker>
+                    </v-col>
+
+                    <v-col cols="12" sm="6">
+                      <gz-pick-list
+                        :aya-type="ayaTypes().Report"
+                        :variant="ayaTypes().WorkOrder.toString()"
+                        show-edit-icon
+                        v-model="obj.customerTagWorkOrderReport2Id"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('DefaultReport')"
+                        ref="customerTagWorkOrderReport2Id"
+                        data-cy="customerTagWorkOrderReport2Id"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerTagWorkOrderReport2Id'
+                          )
+                        "
+                        @input="
+                          fieldValueChanged('customerTagWorkOrderReport2Id')
+                        "
+                      ></gz-pick-list>
+                    </v-col>
+
+                    <!-- ------------ -->
+                    <v-col cols="12" sm="6">
+                      <gz-tag-picker
+                        v-model="obj.customerWorkOrderReport3Tags"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('CustomerTaggedWith')"
+                        ref="customerWorkOrderReport3Tags"
+                        data-cy="customerWorkOrderReport3Tags"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerWorkOrderReport3Tags'
+                          )
+                        "
+                        @input="
+                          fieldValueChanged('customerWorkOrderReport3Tags')
+                        "
+                      ></gz-tag-picker>
+                    </v-col>
+
+                    <v-col cols="12" sm="6">
+                      <gz-pick-list
+                        :aya-type="ayaTypes().Report"
+                        :variant="ayaTypes().WorkOrder.toString()"
+                        show-edit-icon
+                        v-model="obj.customerTagWorkOrderReport3Id"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('DefaultReport')"
+                        ref="customerTagWorkOrderReport3Id"
+                        data-cy="customerTagWorkOrderReport3Id"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerTagWorkOrderReport3Id'
+                          )
+                        "
+                        @input="
+                          fieldValueChanged('customerTagWorkOrderReport3Id')
+                        "
+                      ></gz-pick-list>
+                    </v-col>
+
+                    <!-- ------------ -->
+                    <v-col cols="12" sm="6">
+                      <gz-tag-picker
+                        v-model="obj.customerWorkOrderReport4Tags"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('CustomerTaggedWith')"
+                        ref="customerWorkOrderReport4Tags"
+                        data-cy="customerWorkOrderReport4Tags"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerWorkOrderReport4Tags'
+                          )
+                        "
+                        @input="
+                          fieldValueChanged('customerWorkOrderReport4Tags')
+                        "
+                      ></gz-tag-picker>
+                    </v-col>
+
+                    <v-col cols="12" sm="6">
+                      <gz-pick-list
+                        :aya-type="ayaTypes().Report"
+                        :variant="ayaTypes().WorkOrder.toString()"
+                        show-edit-icon
+                        v-model="obj.customerTagWorkOrderReport4Id"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('DefaultReport')"
+                        ref="customerTagWorkOrderReport4Id"
+                        data-cy="customerTagWorkOrderReport4Id"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerTagWorkOrderReport4Id'
+                          )
+                        "
+                        @input="
+                          fieldValueChanged('customerTagWorkOrderReport4Id')
+                        "
+                      ></gz-pick-list>
+                    </v-col>
+
+                    <!-- ------------ -->
+                    <v-col cols="12" sm="6">
+                      <gz-tag-picker
+                        v-model="obj.customerWorkOrderReport5Tags"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('CustomerTaggedWith')"
+                        ref="customerWorkOrderReport5Tags"
+                        data-cy="customerWorkOrderReport5Tags"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerWorkOrderReport5Tags'
+                          )
+                        "
+                        @input="
+                          fieldValueChanged('customerWorkOrderReport5Tags')
+                        "
+                      ></gz-tag-picker>
+                    </v-col>
+
+                    <v-col cols="12" sm="6">
+                      <gz-pick-list
+                        :aya-type="ayaTypes().Report"
+                        :variant="ayaTypes().WorkOrder.toString()"
+                        show-edit-icon
+                        v-model="obj.customerTagWorkOrderReport5Id"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('DefaultReport')"
+                        ref="customerTagWorkOrderReport5Id"
+                        data-cy="customerTagWorkOrderReport5Id"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerTagWorkOrderReport5Id'
+                          )
+                        "
+                        @input="
+                          fieldValueChanged('customerTagWorkOrderReport5Id')
+                        "
+                      ></gz-pick-list>
+                    </v-col>
                   </v-row>
                 </v-expansion-panel-content>
               </v-expansion-panel>