diff --git a/ayanova/src/views/adm-global-settings.vue b/ayanova/src/views/adm-global-settings.vue
index db736106..05bc50f6 100644
--- a/ayanova/src/views/adm-global-settings.vue
+++ b/ayanova/src/views/adm-global-settings.vue
@@ -201,346 +201,438 @@
               {{ $ay.t("CustomerAccessSettings") }}
             </div>
           </v-col>
-          <!-- ######################################################## -->
-          <v-col cols="12">
-            <div class="text-subtitle-1">
-              {{ $ay.t("CustomerServiceRequestList") }}
-            </div>
-          </v-col>
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-checkbox
-              v-model="obj.customerAllowCSR"
-              :readonly="formState.readOnly"
-              :label="$ay.t('Active')"
-              ref="customerAllowCSR"
-              data-cy="customerAllowCSR"
-              :error-messages="form().serverErrors(this, 'customerAllowCSR')"
-              @change="fieldValueChanged('customerAllowCSR')"
-            ></v-checkbox>
-          </v-col>
-
-          <v-col cols="12" sm="6" lg="4">
-            <gz-tag-picker
-              v-model="obj.customerAllowCSRInTags"
-              :readonly="formState.readOnly"
-              :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"              
-              ref="customerAllowCSRInTags"
-              data-cy="customerAllowCSRInTags"
-              :error-messages="
-                form().serverErrors(this, 'customerAllowCSRInTags')
-              "
-              @input="fieldValueChanged('customerAllowCSRInTags')"
-            ></gz-tag-picker>
-          </v-col>
-
-          <v-col cols="12">
-            <v-textarea
-              v-model="obj.customerServiceRequestInfoText"
-              :readonly="formState.readOnly"
-              :label="$ay.t('CSRInfoText')"
-              :error-messages="
-                form().serverErrors(this, 'customerServiceRequestInfoText')
-              "
-              ref="customerServiceRequestInfoText"
-              data-cy="customerServiceRequestInfoText"
-              @input="fieldValueChanged('customerServiceRequestInfoText')"
-              auto-grow
-            ></v-textarea>
-          </v-col>
-          <!-- ######################################################## -->
-          <v-col cols="12">
-            <div class="text-subtitle-1">
-              {{ $ay.t("WorkOrderList") }}
-            </div>
-          </v-col>
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-checkbox
-              v-model="obj.customerAllowViewWO"
-              :readonly="formState.readOnly"
-              :label="$ay.t('Active')"
-              ref="customerAllowViewWO"
-              data-cy="customerAllowViewWO"
-              :error-messages="form().serverErrors(this, 'customerAllowViewWO')"
-              @change="fieldValueChanged('customerAllowViewWO')"
-            ></v-checkbox>
-          </v-col>
-          <v-col cols="12" sm="6" lg="4">
-            <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">
-            <gz-pick-list
-              :aya-type="ayaTypes().Report"
-              :variant="ayaTypes().WorkOrder.toString()"
-              show-edit-icon
-              v-model="obj.customerDefaultWorkOrderReportId"
-              :readonly="formState.readOnly"
-              :label="$ay.t('CustomerAccessWorkOrderReport')"
-              ref="customerDefaultWorkOrderReportId"
-              data-cy="customerDefaultWorkOrderReportId"
-              :error-messages="
-                form().serverErrors(this, 'customerDefaultWorkOrderReportId')
-              "
-              @input="fieldValueChanged('customerDefaultWorkOrderReportId')"
-            ></gz-pick-list>
-          </v-col>
 
           <!-- ######################################################## -->
           <v-col cols="12">
-            <div class="text-subtitle-1">
-              {{ $ay.t("CustomerAccessWorkOrderWiki") }}
-            </div>
-          </v-col>
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-checkbox
-              v-model="obj.customerAllowWOWiki"
-              :readonly="formState.readOnly"
-              :label="$ay.t('Active')"
-              ref="customerAllowWOWiki"
-              data-cy="customerAllowWOWiki"
-              :error-messages="form().serverErrors(this, 'customerAllowWOWiki')"
-              @change="fieldValueChanged('customerAllowWOWiki')"
-            ></v-checkbox>
-          </v-col>
-          <v-col cols="12" sm="6" lg="4">
-            <gz-tag-picker
-              v-model="obj.customerAllowWOWikiInTags"
-              :readonly="formState.readOnly"
-              :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
-              ref="customerAllowWOWikiInTags"
-              data-cy="customerAllowWOWikiInTags"
-              :error-messages="
-                form().serverErrors(this, 'customerAllowWOWikiInTags')
-              "
-              @input="fieldValueChanged('customerAllowWOWikiInTags')"
-            ></gz-tag-picker>
-          </v-col>
+            <v-expansion-panels>
+              <v-expansion-panel key="1">
+                <v-expansion-panel-header>
+                  <span class="text-h6">
+                    {{ $ay.t("CustomerServiceRequestList") }}
+                  </span>
+                </v-expansion-panel-header>
+                <v-expansion-panel-content>
+                  <v-row>
+                    <v-col cols="12" sm="6" lg="2">
+                      <v-checkbox
+                        v-model="obj.customerAllowCSR"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('Active')"
+                        ref="customerAllowCSR"
+                        data-cy="customerAllowCSR"
+                        :error-messages="
+                          form().serverErrors(this, 'customerAllowCSR')
+                        "
+                        @change="fieldValueChanged('customerAllowCSR')"
+                      ></v-checkbox>
+                    </v-col>
 
-          <!-- ######################################################## -->
-          <v-col cols="12">
-            <div class="text-subtitle-1">
-              {{ $ay.t("UserSettings") }}
-            </div>
-          </v-col>
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-checkbox
-              v-model="obj.customerAllowUserSettings"
-              :readonly="formState.readOnly"
-              :label="$ay.t('Active')"
-              ref="customerAllowUserSettings"
-              data-cy="customerAllowUserSettings"
-              :error-messages="
-                form().serverErrors(this, 'customerAllowUserSettings')
-              "
-              @change="fieldValueChanged('customerAllowUserSettings')"
-            ></v-checkbox>
-          </v-col>
-          <v-col cols="12" sm="6" lg="4">
-            <gz-tag-picker
-              v-model="obj.customerAllowUserSettingsInTags"
-              :readonly="formState.readOnly"
-              :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
-              ref="customerAllowUserSettingsInTags"
-              data-cy="customerAllowUserSettingsInTags"
-              :error-messages="
-                form().serverErrors(this, 'customerAllowUserSettingsInTags')
-              "
-              @input="fieldValueChanged('customerAllowUserSettingsInTags')"
-            ></gz-tag-picker>
-          </v-col>
+                    <v-col cols="12" sm="6" lg="10">
+                      <gz-tag-picker
+                        v-model="obj.customerAllowCSRInTags"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
+                        ref="customerAllowCSRInTags"
+                        data-cy="customerAllowCSRInTags"
+                        :error-messages="
+                          form().serverErrors(this, 'customerAllowCSRInTags')
+                        "
+                        @input="fieldValueChanged('customerAllowCSRInTags')"
+                      ></gz-tag-picker>
+                    </v-col>
 
-          <!-- ######################################################## -->
-          <v-col cols="12">
-            <div class="text-h6 mb-8">
-              {{ $ay.t("NotifySubscriptionList") }}
-            </div>
-            <div class="text-subtitle-1">
-              {{ $ay.t("NotifyEventCustomerServiceImminent") }}
-            </div>
-          </v-col>
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-checkbox
-              v-model="obj.customerAllowNotifyServiceImminent"
-              :readonly="formState.readOnly"
-              :label="$ay.t('Active')"
-              ref="customerAllowNotifyServiceImminent"
-              data-cy="customerAllowNotifyServiceImminent"
-              :error-messages="
-                form().serverErrors(this, 'customerAllowNotifyServiceImminent')
-              "
-              @change="fieldValueChanged('customerAllowNotifyServiceImminent')"
-            ></v-checkbox>
-          </v-col>
-          <v-col cols="12" sm="6" lg="4">
-            <gz-tag-picker
-              v-model="obj.customerAllowNotifyServiceImminentInTags"
-              :readonly="formState.readOnly"
-              :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
-              ref="customerAllowNotifyServiceImminentInTags"
-              data-cy="customerAllowNotifyServiceImminentInTags"
-              :error-messages="
-                form().serverErrors(
-                  this,
-                  'customerAllowNotifyServiceImminentInTags'
-                )
-              "
-              @input="
-                fieldValueChanged('customerAllowNotifyServiceImminentInTags')
-              "
-            ></gz-tag-picker>
-          </v-col>
+                    <v-col cols="12">
+                      <v-textarea
+                        v-model="obj.customerServiceRequestInfoText"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('CSRInfoText')"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerServiceRequestInfoText'
+                          )
+                        "
+                        ref="customerServiceRequestInfoText"
+                        data-cy="customerServiceRequestInfoText"
+                        @input="
+                          fieldValueChanged('customerServiceRequestInfoText')
+                        "
+                        auto-grow
+                      ></v-textarea>
+                    </v-col>
+                  </v-row>
+                </v-expansion-panel-content>
+              </v-expansion-panel>
+              <v-expansion-panel key="2">
+                <v-expansion-panel-header>
+                  <span class="text-h6">
+                    {{ $ay.t("WorkOrderList") }}
+                  </span>
+                </v-expansion-panel-header>
+                <v-expansion-panel-content>
+                  <v-row>
+                    <v-col cols="12" sm="6" lg="2">
+                      <v-checkbox
+                        v-model="obj.customerAllowViewWO"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('Active')"
+                        ref="customerAllowViewWO"
+                        data-cy="customerAllowViewWO"
+                        :error-messages="
+                          form().serverErrors(this, 'customerAllowViewWO')
+                        "
+                        @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">
-            <div class="text-subtitle-1">
-              {{ $ay.t("NotifyEventCSRAccepted") }}
-            </div>
-          </v-col>
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-checkbox
-              v-model="obj.customerAllowNotifyCSRAccepted"
-              :readonly="formState.readOnly"
-              :label="$ay.t('Active')"
-              ref="customerAllowNotifyCSRAccepted"
-              data-cy="customerAllowNotifyCSRAccepted"
-              :error-messages="
-                form().serverErrors(this, 'customerAllowNotifyCSRAccepted')
-              "
-              @change="fieldValueChanged('customerAllowNotifyCSRAccepted')"
-            ></v-checkbox>
-          </v-col>
-          <v-col cols="12" sm="6" lg="4">
-            <gz-tag-picker
-              v-model="obj.customerAllowNotifyCSRAcceptedInTags"
-              :readonly="formState.readOnly"
-              :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
-              ref="customerAllowNotifyCSRAcceptedInTags"
-              data-cy="customerAllowNotifyCSRAcceptedInTags"
-              :error-messages="
-                form().serverErrors(
-                  this,
-                  'customerAllowNotifyCSRAcceptedInTags'
-                )
-              "
-              @input="fieldValueChanged('customerAllowNotifyCSRAcceptedInTags')"
-            ></gz-tag-picker>
-          </v-col>
+                    <v-col cols="12" sm="6" lg="5">
+                      <gz-pick-list
+                        :aya-type="ayaTypes().Report"
+                        :variant="ayaTypes().WorkOrder.toString()"
+                        show-edit-icon
+                        v-model="obj.customerDefaultWorkOrderReportId"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('DefaultCustomerAccessWorkOrderReport')"
+                        ref="customerDefaultWorkOrderReportId"
+                        data-cy="customerDefaultWorkOrderReportId"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerDefaultWorkOrderReportId'
+                          )
+                        "
+                        @input="
+                          fieldValueChanged('customerDefaultWorkOrderReportId')
+                        "
+                      ></gz-pick-list>
+                    </v-col>
+                  </v-row>
+                </v-expansion-panel-content>
+              </v-expansion-panel>
+              <v-expansion-panel key="3">
+                <v-expansion-panel-header>
+                  <span class="text-h6">
+                    {{ $ay.t("CustomerAccessWorkOrderWiki") }}
+                  </span>
+                </v-expansion-panel-header>
+                <v-expansion-panel-content>
+                  <v-row>
+                    <v-col cols="12" sm="6" lg="2">
+                      <v-checkbox
+                        v-model="obj.customerAllowWOWiki"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('Active')"
+                        ref="customerAllowWOWiki"
+                        data-cy="customerAllowWOWiki"
+                        :error-messages="
+                          form().serverErrors(this, 'customerAllowWOWiki')
+                        "
+                        @change="fieldValueChanged('customerAllowWOWiki')"
+                      ></v-checkbox>
+                    </v-col>
+                    <v-col cols="12" sm="6" lg="10">
+                      <gz-tag-picker
+                        v-model="obj.customerAllowWOWikiInTags"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
+                        ref="customerAllowWOWikiInTags"
+                        data-cy="customerAllowWOWikiInTags"
+                        :error-messages="
+                          form().serverErrors(this, 'customerAllowWOWikiInTags')
+                        "
+                        @input="fieldValueChanged('customerAllowWOWikiInTags')"
+                      ></gz-tag-picker>
+                    </v-col>
+                  </v-row>
+                </v-expansion-panel-content>
+              </v-expansion-panel>
+              <v-expansion-panel key="4">
+                <v-expansion-panel-header>
+                  <span class="text-h6">
+                    {{ $ay.t("UserSettings") }}
+                  </span>
+                </v-expansion-panel-header>
+                <v-expansion-panel-content>
+                  <v-row>
+                    <v-col cols="12" sm="6" lg="2">
+                      <v-checkbox
+                        v-model="obj.customerAllowUserSettings"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('Active')"
+                        ref="customerAllowUserSettings"
+                        data-cy="customerAllowUserSettings"
+                        :error-messages="
+                          form().serverErrors(this, 'customerAllowUserSettings')
+                        "
+                        @change="fieldValueChanged('customerAllowUserSettings')"
+                      ></v-checkbox>
+                    </v-col>
+                    <v-col cols="12" sm="6" lg="10">
+                      <gz-tag-picker
+                        v-model="obj.customerAllowUserSettingsInTags"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
+                        ref="customerAllowUserSettingsInTags"
+                        data-cy="customerAllowUserSettingsInTags"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerAllowUserSettingsInTags'
+                          )
+                        "
+                        @input="
+                          fieldValueChanged('customerAllowUserSettingsInTags')
+                        "
+                      ></gz-tag-picker>
+                    </v-col>
+                  </v-row>
+                </v-expansion-panel-content>
+              </v-expansion-panel>
+              <v-expansion-panel key="5">
+                <v-expansion-panel-header>
+                  <span class="text-h6">
+                    {{ $ay.t("NotifySubscriptionList") }}
+                  </span>
+                </v-expansion-panel-header>
+                <v-expansion-panel-content>
+                  <v-col cols="12">
+                    <div class="text-subtitle-1">
+                      {{ $ay.t("NotifyEventCustomerServiceImminent") }}
+                    </div>
+                  </v-col>
+                  <v-col cols="12" sm="6" lg="4" xl="3">
+                    <v-checkbox
+                      v-model="obj.customerAllowNotifyServiceImminent"
+                      :readonly="formState.readOnly"
+                      :label="$ay.t('Active')"
+                      ref="customerAllowNotifyServiceImminent"
+                      data-cy="customerAllowNotifyServiceImminent"
+                      :error-messages="
+                        form().serverErrors(
+                          this,
+                          'customerAllowNotifyServiceImminent'
+                        )
+                      "
+                      @change="
+                        fieldValueChanged('customerAllowNotifyServiceImminent')
+                      "
+                    ></v-checkbox>
+                  </v-col>
+                  <v-col cols="12" sm="6" lg="4">
+                    <gz-tag-picker
+                      v-model="obj.customerAllowNotifyServiceImminentInTags"
+                      :readonly="formState.readOnly"
+                      :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
+                      ref="customerAllowNotifyServiceImminentInTags"
+                      data-cy="customerAllowNotifyServiceImminentInTags"
+                      :error-messages="
+                        form().serverErrors(
+                          this,
+                          'customerAllowNotifyServiceImminentInTags'
+                        )
+                      "
+                      @input="
+                        fieldValueChanged(
+                          'customerAllowNotifyServiceImminentInTags'
+                        )
+                      "
+                    ></gz-tag-picker>
+                  </v-col>
 
-          <!-- ######################################################## -->
-          <v-col cols="12">
-            <div class="text-subtitle-1">
-              {{ $ay.t("NotifyEventCSRRejected") }}
-            </div>
-          </v-col>
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-checkbox
-              v-model="obj.customerAllowNotifyCSRRejected"
-              :readonly="formState.readOnly"
-              :label="$ay.t('Active')"
-              ref="customerAllowNotifyCSRRejected"
-              data-cy="customerAllowNotifyCSRRejected"
-              :error-messages="
-                form().serverErrors(this, 'customerAllowNotifyCSRRejected')
-              "
-              @change="fieldValueChanged('customerAllowNotifyCSRRejected')"
-            ></v-checkbox>
-          </v-col>
-          <v-col cols="12" sm="6" lg="4">
-            <gz-tag-picker
-              v-model="obj.customerAllowNotifyCSRRejectedInTags"
-              :readonly="formState.readOnly"
-              :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
-              ref="customerAllowNotifyCSRRejectedInTags"
-              data-cy="customerAllowNotifyCSRRejectedInTags"
-              :error-messages="
-                form().serverErrors(
-                  this,
-                  'customerAllowNotifyCSRRejectedInTags'
-                )
-              "
-              @input="fieldValueChanged('customerAllowNotifyCSRRejectedInTags')"
-            ></gz-tag-picker>
-          </v-col>
+                  <!-- ######################################################## -->
+                  <v-col cols="12">
+                    <div class="text-subtitle-1">
+                      {{ $ay.t("NotifyEventCSRAccepted") }}
+                    </div>
+                  </v-col>
+                  <v-col cols="12" sm="6" lg="4" xl="3">
+                    <v-checkbox
+                      v-model="obj.customerAllowNotifyCSRAccepted"
+                      :readonly="formState.readOnly"
+                      :label="$ay.t('Active')"
+                      ref="customerAllowNotifyCSRAccepted"
+                      data-cy="customerAllowNotifyCSRAccepted"
+                      :error-messages="
+                        form().serverErrors(
+                          this,
+                          'customerAllowNotifyCSRAccepted'
+                        )
+                      "
+                      @change="
+                        fieldValueChanged('customerAllowNotifyCSRAccepted')
+                      "
+                    ></v-checkbox>
+                  </v-col>
+                  <v-col cols="12" sm="6" lg="4">
+                    <gz-tag-picker
+                      v-model="obj.customerAllowNotifyCSRAcceptedInTags"
+                      :readonly="formState.readOnly"
+                      :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
+                      ref="customerAllowNotifyCSRAcceptedInTags"
+                      data-cy="customerAllowNotifyCSRAcceptedInTags"
+                      :error-messages="
+                        form().serverErrors(
+                          this,
+                          'customerAllowNotifyCSRAcceptedInTags'
+                        )
+                      "
+                      @input="
+                        fieldValueChanged(
+                          'customerAllowNotifyCSRAcceptedInTags'
+                        )
+                      "
+                    ></gz-tag-picker>
+                  </v-col>
 
-          <!-- ######################################################## -->
-          <v-col cols="12">
-            <div class="text-subtitle-1">
-              {{ $ay.t("NotifyEventWorkorderCreatedForCustomer") }}
-            </div>
-          </v-col>
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-checkbox
-              v-model="obj.customerAllowNotifyWOCreated"
-              :readonly="formState.readOnly"
-              :label="$ay.t('Active')"
-              ref="customerAllowNotifyWOCreated"
-              data-cy="customerAllowNotifyWOCreated"
-              :error-messages="
-                form().serverErrors(this, 'customerAllowNotifyWOCreated')
-              "
-              @change="fieldValueChanged('customerAllowNotifyWOCreated')"
-            ></v-checkbox>
-          </v-col>
-          <v-col cols="12" sm="6" lg="4">
-            <gz-tag-picker
-              v-model="obj.customerAllowNotifyWOCreatedInTags"
-              :readonly="formState.readOnly"
-              :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
-              ref="customerAllowNotifyWOCreatedInTags"
-              data-cy="customerAllowNotifyWOCreatedInTags"
-              :error-messages="
-                form().serverErrors(this, 'customerAllowNotifyWOCreatedInTags')
-              "
-              @input="fieldValueChanged('customerAllowNotifyWOCreatedInTags')"
-            ></gz-tag-picker>
-          </v-col>
+                  <!-- ######################################################## -->
+                  <v-col cols="12">
+                    <div class="text-subtitle-1">
+                      {{ $ay.t("NotifyEventCSRRejected") }}
+                    </div>
+                  </v-col>
+                  <v-col cols="12" sm="6" lg="4" xl="3">
+                    <v-checkbox
+                      v-model="obj.customerAllowNotifyCSRRejected"
+                      :readonly="formState.readOnly"
+                      :label="$ay.t('Active')"
+                      ref="customerAllowNotifyCSRRejected"
+                      data-cy="customerAllowNotifyCSRRejected"
+                      :error-messages="
+                        form().serverErrors(
+                          this,
+                          'customerAllowNotifyCSRRejected'
+                        )
+                      "
+                      @change="
+                        fieldValueChanged('customerAllowNotifyCSRRejected')
+                      "
+                    ></v-checkbox>
+                  </v-col>
+                  <v-col cols="12" sm="6" lg="4">
+                    <gz-tag-picker
+                      v-model="obj.customerAllowNotifyCSRRejectedInTags"
+                      :readonly="formState.readOnly"
+                      :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
+                      ref="customerAllowNotifyCSRRejectedInTags"
+                      data-cy="customerAllowNotifyCSRRejectedInTags"
+                      :error-messages="
+                        form().serverErrors(
+                          this,
+                          'customerAllowNotifyCSRRejectedInTags'
+                        )
+                      "
+                      @input="
+                        fieldValueChanged(
+                          'customerAllowNotifyCSRRejectedInTags'
+                        )
+                      "
+                    ></gz-tag-picker>
+                  </v-col>
 
-          <!-- ######################################################## -->
-          <v-col cols="12">
-            <div class="text-subtitle-1">
-              {{ $ay.t("NotifyEventWorkorderCompleted") }}
-            </div>
-          </v-col>
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-checkbox
-              v-model="obj.customerAllowNotifyWOCompleted"
-              :readonly="formState.readOnly"
-              :label="$ay.t('Active')"
-              ref="customerAllowNotifyWOCompleted"
-              data-cy="customerAllowNotifyWOCompleted"
-              :error-messages="
-                form().serverErrors(this, 'customerAllowNotifyWOCompleted')
-              "
-              @change="fieldValueChanged('customerAllowNotifyWOCompleted')"
-            ></v-checkbox>
-          </v-col>
-          <v-col cols="12" sm="6" lg="4">
-            <gz-tag-picker
-              v-model="obj.customerAllowNotifyWOCompletedInTags"
-              :readonly="formState.readOnly"
-              :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
-              ref="customerAllowNotifyWOCompletedInTags"
-              data-cy="customerAllowNotifyWOCompletedInTags"
-              :error-messages="
-                form().serverErrors(
-                  this,
-                  'customerAllowNotifyWOCompletedInTags'
-                )
-              "
-              @input="fieldValueChanged('customerAllowNotifyWOCompletedInTags')"
-            ></gz-tag-picker>
-          </v-col>
+                  <!-- ######################################################## -->
+                  <v-col cols="12">
+                    <div class="text-subtitle-1">
+                      {{ $ay.t("NotifyEventWorkorderCreatedForCustomer") }}
+                    </div>
+                  </v-col>
+                  <v-col cols="12" sm="6" lg="4" xl="3">
+                    <v-checkbox
+                      v-model="obj.customerAllowNotifyWOCreated"
+                      :readonly="formState.readOnly"
+                      :label="$ay.t('Active')"
+                      ref="customerAllowNotifyWOCreated"
+                      data-cy="customerAllowNotifyWOCreated"
+                      :error-messages="
+                        form().serverErrors(
+                          this,
+                          'customerAllowNotifyWOCreated'
+                        )
+                      "
+                      @change="
+                        fieldValueChanged('customerAllowNotifyWOCreated')
+                      "
+                    ></v-checkbox>
+                  </v-col>
+                  <v-col cols="12" sm="6" lg="4">
+                    <gz-tag-picker
+                      v-model="obj.customerAllowNotifyWOCreatedInTags"
+                      :readonly="formState.readOnly"
+                      :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
+                      ref="customerAllowNotifyWOCreatedInTags"
+                      data-cy="customerAllowNotifyWOCreatedInTags"
+                      :error-messages="
+                        form().serverErrors(
+                          this,
+                          'customerAllowNotifyWOCreatedInTags'
+                        )
+                      "
+                      @input="
+                        fieldValueChanged('customerAllowNotifyWOCreatedInTags')
+                      "
+                    ></gz-tag-picker>
+                  </v-col>
 
+                  <!-- ######################################################## -->
+                  <v-col cols="12">
+                    <div class="text-subtitle-1">
+                      {{ $ay.t("NotifyEventWorkorderCompleted") }}
+                    </div>
+                  </v-col>
+                  <v-col cols="12" sm="6" lg="4" xl="3">
+                    <v-checkbox
+                      v-model="obj.customerAllowNotifyWOCompleted"
+                      :readonly="formState.readOnly"
+                      :label="$ay.t('Active')"
+                      ref="customerAllowNotifyWOCompleted"
+                      data-cy="customerAllowNotifyWOCompleted"
+                      :error-messages="
+                        form().serverErrors(
+                          this,
+                          'customerAllowNotifyWOCompleted'
+                        )
+                      "
+                      @change="
+                        fieldValueChanged('customerAllowNotifyWOCompleted')
+                      "
+                    ></v-checkbox>
+                  </v-col>
+                  <v-col cols="12" sm="6" lg="4">
+                    <gz-tag-picker
+                      v-model="obj.customerAllowNotifyWOCompletedInTags"
+                      :readonly="formState.readOnly"
+                      :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
+                      ref="customerAllowNotifyWOCompletedInTags"
+                      data-cy="customerAllowNotifyWOCompletedInTags"
+                      :error-messages="
+                        form().serverErrors(
+                          this,
+                          'customerAllowNotifyWOCompletedInTags'
+                        )
+                      "
+                      @input="
+                        fieldValueChanged(
+                          'customerAllowNotifyWOCompletedInTags'
+                        )
+                      "
+                    ></gz-tag-picker>
+                  </v-col>
+                </v-expansion-panel-content>
+              </v-expansion-panel>
+            </v-expansion-panels>
+          </v-col>
           <!-- **************************************************** -->
         </v-row>
       </v-form>
@@ -648,7 +740,8 @@ export default {
         serverError: {}
       },
       rights: window.$gz.role.defaultRightsObject(),
-      ayaType: window.$gz.type.Project
+      ayaType: window.$gz.type.Project,
+      listgroupitems: []
     };
   },
   watch: {