diff --git a/ayanova/src/views/customer-notify-subscription.vue b/ayanova/src/views/customer-notify-subscription.vue
index 8265129e..15459214 100644
--- a/ayanova/src/views/customer-notify-subscription.vue
+++ b/ayanova/src/views/customer-notify-subscription.vue
@@ -231,11 +231,11 @@
                     ></gz-pick-list>
                   </v-col>
 
-                  <v-col v-if="showTags" cols="12">
+                  <v-col cols="12" sm="6" lg="4" xl="3">
                     <gz-tag-picker
                       ref="tags"
                       v-model="obj.tags"
-                      :label="$ay.t('TaggedWith')"
+                      :label="objectTagsTitle()"
                       :readonly="formState.readOnly"
                       data-cy="tags"
                       :error-messages="form().serverErrors(this, 'tags')"
@@ -466,23 +466,6 @@ export default {
         default:
           return false;
       }
-    },
-    showTags() {
-      if (!window.$gz.store.getters.isCustomerUser) {
-        //customers NEVER see tags anywhere, that's private information and they do not use or require it
-        switch (this.obj.eventType) {
-          case 27: //General notification
-          case 20: //backup status
-          case 28: //server ops problem
-          case 31: //workordercreatedforcustomer customer notification, no tags
-          case 32: //pm generation failure, like ops notice sb on any item
-            return false;
-          default:
-            return true;
-        }
-      } else {
-        return false;
-      }
     }
   },
   watch: {
@@ -572,6 +555,38 @@ export default {
     window.$gz.eventBus.$off("menu-click", clickHandler);
   },
   methods: {
+    objectTagsTitle() {
+      let objectName = null;
+      switch (this.obj.eventType) {
+        case 4: //WorkorderStatusChange = 4
+          objectName = this.$ay.t("WorkOrder");
+          break;
+        case 6: //notifyCSRAccepted;
+          objectName = this.$ay.t("CustomerServiceRequest");
+          break;
+        case 7: //notifyCSRRejected;
+          objectName = this.$ay.t("CustomerServiceRequest");
+          break;
+        case 9: //QuoteStatusChange = 9
+          objectName = this.$ay.t("Quote");
+          break;
+        case 21: //notifyServiceImminent;
+          objectName = this.$ay.t("WorkOrder");
+          break;
+        case 24: //WorkorderStatusAge = 24  This is to replace the v7 wo follow up x days after closed notification to send message for follow up after closed
+          objectName = this.$ay.t("WorkOrder");
+          break;
+        case 30: //notifyWOCompleted;
+          objectName = this.$ay.t("WorkOrder");
+          break;
+        case 31: //notifyWOCreated;
+          objectName = this.$ay.t("WorkOrder");
+          break;
+        default:
+          return false;
+      }
+      return objectName + " - " + this.$ay.t("TaggedWith");
+    },
     goHelp() {
       window.open(
         window.$gz.api.helpUrl() +
@@ -849,7 +864,10 @@ async function fetchTranslatedText() {
     "LanguageCode",
     "TimeZone",
     "Hour12",
-    "Translation"
+    "Translation",
+    "CustomerServiceRequest",
+    "WorkOrder",
+    "Quote"
   ]);
 }