diff --git a/ayanova/src/components/work-order-item-expenses.vue b/ayanova/src/components/work-order-item-expenses.vue
index 8cfb044b..49efee6a 100644
--- a/ayanova/src/components/work-order-item-expenses.vue
+++ b/ayanova/src/components/work-order-item-expenses.vue
@@ -448,6 +448,10 @@ export default {
     activeWoItemIndex: {
       default: null,
       type: Number
+    },
+    gotoIndex: {
+      default: null,
+      type: Number
     }
   },
   watch: {
@@ -455,6 +459,12 @@ export default {
       if (val != oldVal) {
         this.setDefaultView();
       }
+    },
+    gotoIndex(val, oldVal) {
+      if (val != oldVal) {
+        this.selectedRow = [{ index: val }];
+        this.activeItemIndex = val;
+      }
     }
   },
   methods: {
diff --git a/ayanova/src/components/work-order-item-labors.vue b/ayanova/src/components/work-order-item-labors.vue
index d4bc7ce2..cba8428a 100644
--- a/ayanova/src/components/work-order-item-labors.vue
+++ b/ayanova/src/components/work-order-item-labors.vue
@@ -443,6 +443,10 @@ export default {
     activeWoItemIndex: {
       default: null,
       type: Number
+    },
+    gotoIndex: {
+      default: null,
+      type: Number
     }
   },
   watch: {
@@ -450,6 +454,12 @@ export default {
       if (val != oldVal) {
         this.setDefaultView();
       }
+    },
+    gotoIndex(val, oldVal) {
+      if (val != oldVal) {
+        this.selectedRow = [{ index: val }];
+        this.activeItemIndex = val;
+      }
     }
   },
   methods: {
diff --git a/ayanova/src/components/work-order-item-loans.vue b/ayanova/src/components/work-order-item-loans.vue
index fdc069c9..9507130a 100644
--- a/ayanova/src/components/work-order-item-loans.vue
+++ b/ayanova/src/components/work-order-item-loans.vue
@@ -472,6 +472,10 @@ export default {
     activeWoItemIndex: {
       default: null,
       type: Number
+    },
+    gotoIndex: {
+      default: null,
+      type: Number
     }
   },
   watch: {
@@ -479,6 +483,12 @@ export default {
       if (val != oldVal) {
         this.setDefaultView();
       }
+    },
+    gotoIndex(val, oldVal) {
+      if (val != oldVal) {
+        this.selectedRow = [{ index: val }];
+        this.activeItemIndex = val;
+      }
     }
   },
   methods: {
diff --git a/ayanova/src/components/work-order-item-part-requests.vue b/ayanova/src/components/work-order-item-part-requests.vue
index 57e31f87..009be1a4 100644
--- a/ayanova/src/components/work-order-item-part-requests.vue
+++ b/ayanova/src/components/work-order-item-part-requests.vue
@@ -138,6 +138,10 @@ export default {
     activeWoItemIndex: {
       default: null,
       type: Number
+    },
+    gotoIndex: {
+      default: null,
+      type: Number
     }
   },
   watch: {
@@ -145,6 +149,12 @@ export default {
       if (val != oldVal) {
         this.setDefaultView();
       }
+    },
+    gotoIndex(val, oldVal) {
+      if (val != oldVal) {
+        this.selectedRow = [{ index: val }];
+        this.activeItemIndex = val;
+      }
     }
   },
   methods: {
diff --git a/ayanova/src/components/work-order-item-parts.vue b/ayanova/src/components/work-order-item-parts.vue
index de36ca5e..efd60756 100644
--- a/ayanova/src/components/work-order-item-parts.vue
+++ b/ayanova/src/components/work-order-item-parts.vue
@@ -368,6 +368,10 @@ export default {
     activeWoItemIndex: {
       default: null,
       type: Number
+    },
+    gotoIndex: {
+      default: null,
+      type: Number
     }
   },
   watch: {
@@ -375,6 +379,12 @@ export default {
       if (val != oldVal) {
         this.setDefaultView();
       }
+    },
+    gotoIndex(val, oldVal) {
+      if (val != oldVal) {
+        this.selectedRow = [{ index: val }];
+        this.activeItemIndex = val;
+      }
     }
   },
   methods: {
diff --git a/ayanova/src/components/work-order-item-scheduled-users.vue b/ayanova/src/components/work-order-item-scheduled-users.vue
index 86bfa4a1..4bbb45df 100644
--- a/ayanova/src/components/work-order-item-scheduled-users.vue
+++ b/ayanova/src/components/work-order-item-scheduled-users.vue
@@ -313,6 +313,10 @@ export default {
     activeWoItemIndex: {
       default: null,
       type: Number
+    },
+    gotoIndex: {
+      default: null,
+      type: Number
     }
   },
   watch: {
@@ -320,6 +324,12 @@ export default {
       if (val != oldVal) {
         this.setDefaultView();
       }
+    },
+    gotoIndex(val, oldVal) {
+      if (val != oldVal) {
+        this.selectedRow = [{ index: val }];
+        this.activeItemIndex = val;
+      }
     }
   },
   methods: {
diff --git a/ayanova/src/components/work-order-item-tasks.vue b/ayanova/src/components/work-order-item-tasks.vue
index a148df8c..53e8c726 100644
--- a/ayanova/src/components/work-order-item-tasks.vue
+++ b/ayanova/src/components/work-order-item-tasks.vue
@@ -341,6 +341,10 @@ export default {
     activeWoItemIndex: {
       default: null,
       type: Number
+    },
+    gotoIndex: {
+      default: null,
+      type: Number
     }
   },
   watch: {
@@ -348,6 +352,12 @@ export default {
       if (val != oldVal) {
         this.setDefaultView();
       }
+    },
+    gotoIndex(val, oldVal) {
+      if (val != oldVal) {
+        this.selectedRow = [{ index: val }];
+        this.activeItemIndex = val;
+      }
     }
   },
   methods: {
diff --git a/ayanova/src/components/work-order-item-travels.vue b/ayanova/src/components/work-order-item-travels.vue
index a28f4f94..27dd2cfe 100644
--- a/ayanova/src/components/work-order-item-travels.vue
+++ b/ayanova/src/components/work-order-item-travels.vue
@@ -443,6 +443,10 @@ export default {
     activeWoItemIndex: {
       default: null,
       type: Number
+    },
+    gotoIndex: {
+      default: null,
+      type: Number
     }
   },
   watch: {
@@ -450,6 +454,12 @@ export default {
       if (val != oldVal) {
         this.setDefaultView();
       }
+    },
+    gotoIndex(val, oldVal) {
+      if (val != oldVal) {
+        this.selectedRow = [{ index: val }];
+        this.activeItemIndex = val;
+      }
     }
   },
   methods: {
diff --git a/ayanova/src/components/work-order-item-units.vue b/ayanova/src/components/work-order-item-units.vue
index ad62e82e..db1c73b5 100644
--- a/ayanova/src/components/work-order-item-units.vue
+++ b/ayanova/src/components/work-order-item-units.vue
@@ -292,6 +292,10 @@ export default {
     activeWoItemIndex: {
       default: null,
       type: Number
+    },
+    gotoIndex: {
+      default: null,
+      type: Number
     }
   },
   watch: {
@@ -299,6 +303,12 @@ export default {
       if (val != oldVal) {
         this.setDefaultView();
       }
+    },
+    gotoIndex(val, oldVal) {
+      if (val != oldVal) {
+        this.selectedRow = [{ index: val }];
+        this.activeItemIndex = val;
+      }
     }
   },
   methods: {
diff --git a/ayanova/src/components/work-order-items.vue b/ayanova/src/components/work-order-items.vue
index fd368cbe..23c895ea 100644
--- a/ayanova/src/components/work-order-items.vue
+++ b/ayanova/src/components/work-order-items.vue
@@ -365,7 +365,7 @@
         <v-col
           cols="12"
           v-if="
-            pvm.subRights.scheduledUsers.visible &&
+            pvm.subRights.units.visible &&
               form().showMe(this, 'WorkOrderItemUnitList')
           "
         >
@@ -373,6 +373,7 @@
             v-model="value"
             :pvm="pvm"
             :active-wo-item-index="activeItemIndex"
+            :goto-index="gotoUnitIndex"
             data-cy="woItemUnits"
             @change="$emit('change')"
           />
@@ -389,6 +390,7 @@
             v-model="value"
             :pvm="pvm"
             :active-wo-item-index="activeItemIndex"
+            :goto-index="gotoScheduledUserIndex"
             data-cy="woItemScheduledUsers"
             @change="$emit('change')"
           />
@@ -404,6 +406,7 @@
             v-model="value"
             :pvm="pvm"
             :active-wo-item-index="activeItemIndex"
+            :goto-index="gotoTaskIndex"
             data-cy="woItemTasks"
             @change="$emit('change')"
           />
@@ -420,6 +423,7 @@
             v-model="value"
             :pvm="pvm"
             :active-wo-item-index="activeItemIndex"
+            :goto-index="gotoPartIndex"
             data-cy="woItemParts"
             @change="$emit('change')"
           />
@@ -438,6 +442,7 @@
             v-model="value"
             :pvm="pvm"
             :active-wo-item-index="activeItemIndex"
+            :goto-index="gotoPartRequestIndex"
             data-cy="woItemPartRequests"
             @change="$emit('change')"
           />
@@ -454,6 +459,7 @@
             v-model="value"
             :pvm="pvm"
             :active-wo-item-index="activeItemIndex"
+            :goto-index="gotoLaborIndex"
             data-cy="woItemLabors"
             @change="$emit('change')"
           />
@@ -469,6 +475,7 @@
             v-model="value"
             :pvm="pvm"
             :active-wo-item-index="activeItemIndex"
+            :goto-index="gotoTravelIndex"
             data-cy="woItemTravels"
             @change="$emit('change')"
           />
@@ -484,6 +491,7 @@
             v-model="value"
             :pvm="pvm"
             :active-wo-item-index="activeItemIndex"
+            :goto-index="gotoExpenseIndex"
             data-cy="woItemExpenses"
             @change="$emit('change')"
           />
@@ -492,7 +500,7 @@
         <v-col
           cols="12"
           v-if="
-            pvm.subRights.expenses.visible &&
+            pvm.subRights.loans.visible &&
               form().showMe(this, 'WorkOrderItemLoanList')
           "
         >
@@ -500,6 +508,7 @@
             v-model="value"
             :pvm="pvm"
             :active-wo-item-index="activeItemIndex"
+            :goto-index="gotoLoanIndex"
             data-cy="woItemLoans"
             @change="$emit('change')"
           />
@@ -507,7 +516,7 @@
         <v-col
           cols="12"
           v-if="
-            pvm.subRights.expenses.visible &&
+            pvm.subRights.outsideServices.visible &&
               form().showMe(this, 'WorkOrderItemOutsideServiceList')
           "
         >