diff --git a/ayanova/src/views/home-notify-subscription.vue b/ayanova/src/views/home-notify-subscription.vue
index c18dd949..49fdab0c 100644
--- a/ayanova/src/views/home-notify-subscription.vue
+++ b/ayanova/src/views/home-notify-subscription.vue
@@ -33,6 +33,20 @@
               todo: decValue here for "The Andy"
             </v-col>
 
+            <v-col v-if="showAgeValue" cols="12" sm="6" lg="4" xl="3">
+              <gz-duration-picker
+                v-model="obj.ageValue"
+                :readonly="formState.readOnly"
+                :disabled="formState.readOnly"
+                :label="$ay.t('Duration')"
+                :showSeconds="false"
+                ref="ageValue"
+                :data-cy="!!$ay.dev ? 'ageValue' : false"
+                :error-messages="form().serverErrors(this, 'ageValue')"
+                @input="fieldValueChanged('ageValue')"
+              ></gz-duration-picker>
+            </v-col>
+
             <v-col v-if="showAyaType" cols="12" sm="6" lg="4" xl="3">
               <v-select
                 v-model="obj.ayaType"
@@ -307,7 +321,7 @@ export default {
       return this.obj.eventType == 9;
     },
     showDecValue() {
-      return this.obj.eventType == 23;
+      return this.obj.eventType == 23 || this.obj.eventType == 11; //service bank threshold
     },
     showAyaType() {
       switch (this.obj.eventType) {
@@ -322,12 +336,21 @@ export default {
     showAdvanceNotice() {
       switch (this.obj.eventType) {
         case 5:
-        case 0:
-        case 0:
-           case 0:
-        case 0:
-           case 0:
-        case 0:
+        case 12:
+        case 14:
+        case 15:
+        case 16:
+        case 21:
+        case 24: //Actually, this is workorder status age deadman notification, the title would be different for the advance notice thing, maybe its' own control?
+        case 25:
+          return true;
+        default:
+          return false;
+      }
+    },
+    showAgeValue() {
+      switch (this.obj.eventType) {
+        case 24:
           return true;
         default:
           return false;
@@ -729,7 +752,8 @@ async function fetchTranslatedText(vm) {
     "NotifyEventUnitMeterReadingMultipleExceeded",
     "NotifyEventDefaultNotification",
     "NotifyDeliveryMethodApp",
-    "NotifyDeliveryMethodSMTP"
+    "NotifyDeliveryMethodSMTP",
+    "Duration"
   ]);
 }