diff --git a/ayanova/src/views/adm-global-settings.vue b/ayanova/src/views/adm-global-settings.vue
index 6e3d15d6..1f3a8931 100644
--- a/ayanova/src/views/adm-global-settings.vue
+++ b/ayanova/src/views/adm-global-settings.vue
@@ -284,7 +284,7 @@
                         @change="fieldValueChanged('customerAllowViewWO')"
                       ></v-checkbox>
                     </v-col>
-                    <v-col cols="12" sm="6" lg="5">
+                    <!-- <v-col cols="12" sm="6" lg="5">
                       <gz-tag-picker
                         v-model="obj.customerAllowViewWOInTags"
                         :readonly="formState.readOnly"
@@ -296,9 +296,9 @@
                         "
                         @input="fieldValueChanged('customerAllowViewWOInTags')"
                       ></gz-tag-picker>
-                    </v-col>
+                    </v-col> -->
 
-                    <v-col cols="12" sm="6" lg="5">
+                    <v-col cols="12" sm="6" lg="10">
                       <gz-pick-list
                         :aya-type="ayaTypes().Report"
                         :variant="ayaTypes().WorkOrder.toString()"
@@ -319,6 +319,47 @@
                         "
                       ></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')"
+                        ref="customerWorkOrderReport1Tags"
+                        data-cy="customerWorkOrderReport1Tags"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerWorkOrderReport1Tags'
+                          )
+                        "
+                        @input="
+                          fieldValueChanged('customerWorkOrderReport1Tags')
+                        "
+                      ></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.customerTagWorkOrderReport1Id"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('TaggedCustomerAccessWorkOrderReport')"
+                        ref="customerTagWorkOrderReport1Id"
+                        data-cy="customerTagWorkOrderReport1Id"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerTagWorkOrderReport1Id'
+                          )
+                        "
+                        @input="
+                          fieldValueChanged('customerTagWorkOrderReport1Id')
+                        "
+                      ></gz-pick-list>
+                    </v-col>
                   </v-row>
                 </v-expansion-panel-content>
               </v-expansion-panel>
@@ -712,7 +753,17 @@ export default {
         customerAllowNotifyWOCreated: false,
         customerAllowNotifyWOCreatedInTags: [],
         customerAllowNotifyWOCompleted: false,
-        customerAllowNotifyWOCompletedInTags: []
+        customerAllowNotifyWOCompletedInTags: [],
+        customerTagWorkOrderReport1Id: null,
+        customerWorkOrderReport1Tags: [],
+        customerTagWorkOrderReport2Id: null,
+        customerWorkOrderReport2Tags: [],
+        customerTagWorkOrderReport3Id: null,
+        customerWorkOrderReport3Tags: [],
+        customerTagWorkOrderReport4Id: null,
+        customerWorkOrderReport4Tags: [],
+        customerTagWorkOrderReport5Id: null,
+        customerWorkOrderReport5Tags: []
       },
       formState: {
         ready: false,