diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 18ea9aa4..075d671f 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -268,7 +268,8 @@ TODO: 1 BETA DOCS:
     rather than bombing.  maybe do this first so can catch the ones that slip through
 
 - 1 todo: Search limited to a type is *not* working, it just returns all results, search from a Customer for example and you will see all object results
-
+= 1 todo: tags required field validation not working?
+- 1 todo: wiki control needs to be able to show validation errors when minimized so when it's a required field it can show if empty
 - 1 todo: time control in native browser format isn't showing a title at all, check date as well.  Date and time is ok
 - 1 todo: help about does it show user has native date time input use browser override?
 
diff --git a/ayanova/src/components/work-order-header.vue b/ayanova/src/components/work-order-header.vue
index 7db55986..bec3f8c8 100644
--- a/ayanova/src/components/work-order-header.vue
+++ b/ayanova/src/components/work-order-header.vue
@@ -61,7 +61,7 @@
       </v-col>
       <v-col
         v-if="
-          form().showMe(this, 'WorkOrderStatus') &&
+          form().showMe(this, 'LastStatusId') &&
             !(
               value.userIsSubContractorFull ||
               value.userIsSubContractorRestricted
@@ -148,7 +148,7 @@
 
       <v-col
         v-if="
-          form().showMe(this, 'WorkOrderCloseByDate') &&
+          form().showMe(this, 'CompleteByDate') &&
             !(
               value.userIsSubContractorFull ||
               value.userIsSubContractorRestricted
@@ -172,7 +172,7 @@
 
       <v-col
         v-if="
-          form().showMe(this, 'Contract') &&
+          form().showMe(this, 'ContractId') &&
             !(
               value.userIsSubContractorFull ||
               value.userIsSubContractorRestricted
@@ -198,7 +198,7 @@
 
       <v-col
         v-if="
-          form().showMe(this, 'Project') &&
+          form().showMe(this, 'ProjectId') &&
             !(
               value.userIsSubContractorFull ||
               value.userIsSubContractorRestricted
@@ -224,7 +224,7 @@
 
       <v-col
         v-if="
-          form().showMe(this, 'WorkOrderInvoiceNumber') &&
+          form().showMe(this, 'InvoiceNumber') &&
             !(
               value.userIsSubContractorFull ||
               value.userIsSubContractorRestricted
@@ -248,7 +248,7 @@
 
       <v-col
         v-if="
-          form().showMe(this, 'WorkOrderServiceDate') &&
+          form().showMe(this, 'ServiceDate') &&
             !(
               value.userIsSubContractorFull ||
               value.userIsSubContractorRestricted
@@ -271,7 +271,7 @@
       </v-col>
 
       <v-col
-        v-if="form().showMe(this, 'WorkOrderCustomerContactName')"
+        v-if="form().showMe(this, 'CustomerContactName')"
         cols="12"
         sm="6"
         lg="4"
@@ -295,7 +295,7 @@
 
       <v-col
         v-if="
-          form().showMe(this, 'WorkOrderCustomerReferenceNumber') &&
+          form().showMe(this, 'CustomerReferenceNumber') &&
             !(
               value.userIsSubContractorFull ||
               value.userIsSubContractorRestricted
@@ -343,7 +343,7 @@
 
       <v-col
         v-if="
-          form().showMe(this, 'WorkOrderOnsite') &&
+          form().showMe(this, 'Onsite') &&
             !(
               value.userIsSubContractorFull ||
               value.userIsSubContractorRestricted
diff --git a/ayanova/src/components/work-order-items.vue b/ayanova/src/components/work-order-items.vue
index 9e5b221d..8bbf8209 100644
--- a/ayanova/src/components/work-order-items.vue
+++ b/ayanova/src/components/work-order-items.vue
@@ -309,7 +309,7 @@
           ></v-text-field>
         </v-col>
 
-        <v-col v-if="form().showMe(this, 'WorkOrderItemTechNotes')" cols="12">
+        <v-col v-if="form().showMe(this, 'TechNotes')" cols="12">
           <v-textarea
             :ref="`items[${activeItemIndex}].techNotes`"
             v-model="value.items[activeItemIndex].techNotes"
@@ -327,7 +327,7 @@
 
         <v-col
           v-if="
-            form().showMe(this, 'WorkOrderItemRequestDate') &&
+            form().showMe(this, 'ItemRequestDate') &&
               !value.userIsRestrictedType
           "
           cols="12"