diff --git a/.vscode/launch.json b/.vscode/launch.json
index df7ec2ec..0e2049e9 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -4,7 +4,7 @@
   // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
   "version": "0.2.0",
   "configurations": [
-    
+
     {
       "name": ".NET Core Launch (web)",
       "type": "coreclr",
@@ -53,7 +53,7 @@
         "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
         "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
         "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
-        "AYANOVA_SERVER_TEST_MODE": "true",
+        "AYANOVA_SERVER_TEST_MODE": "false",
         "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
         "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
         "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"
diff --git a/server/AyaNova/AyaNova.csproj b/server/AyaNova/AyaNova.csproj
index f9f3e7d5..8554b0a2 100644
--- a/server/AyaNova/AyaNova.csproj
+++ b/server/AyaNova/AyaNova.csproj
@@ -4,8 +4,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <GenerateFullPaths>true</GenerateFullPaths>    
-    <Version>8.0.0-alpha.88</Version>
-    <FileVersion>8.0.0.88</FileVersion>
+    <Version>8.0.0-alpha.89</Version>
+    <FileVersion>8.0.0.89</FileVersion>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
     <noWarn>1591</noWarn>
   </PropertyGroup>
diff --git a/server/AyaNova/PickList/WorkOrderTemplatePickList.cs b/server/AyaNova/PickList/WorkOrderTemplatePickList.cs
new file mode 100644
index 00000000..9a27cedf
--- /dev/null
+++ b/server/AyaNova/PickList/WorkOrderTemplatePickList.cs
@@ -0,0 +1,66 @@
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+using AyaNova.Biz;
+namespace AyaNova.PickList
+{
+    internal class WorkOrderTemplatePickList : AyaPickList
+    {
+        public WorkOrderTemplatePickList()
+        {
+
+            DefaultListObjectType = AyaType.WorkOrderTemplate;
+            SQLFrom = "from aworkordertemplate";
+            AllowedRoles = BizRoles.GetRoleSet(DefaultListObjectType).Select;
+            dynamic dTemplate = new JArray();
+
+            dynamic cm = new JObject();
+            cm.fld = "username";
+            dTemplate.Add(cm);
+
+            cm = new JObject();
+            cm.fld = "useremployeenumber";
+            dTemplate.Add(cm);
+
+            cm = new JObject();
+            cm.fld = "usertags";
+            dTemplate.Add(cm);
+
+            base.DefaultTemplate = dTemplate.ToString(Newtonsoft.Json.Formatting.None);
+
+            //NOTE: Due to the join, all the sql id and name fields that can conflict with the joined table need to be specified completely
+            ColumnDefinitions = new List<AyaPickListFieldDefinition>();
+            ColumnDefinitions.Add(new AyaPickListFieldDefinition
+            {
+                TKey = "Active",
+                FieldKey = "useractive",
+                ColumnDataType = UiFieldDataType.Bool,
+                SqlValueColumnName = "auser.active",
+                IsActiveColumn = true
+            });
+            ColumnDefinitions.Add(new AyaPickListFieldDefinition
+            {
+                TKey = "Name",
+                FieldKey = "username",
+                ColumnDataType = UiFieldDataType.Text,
+                SqlIdColumnName = "auser.id",
+                SqlValueColumnName = "auser.name",
+                IsRowId = true
+            });
+            ColumnDefinitions.Add(new AyaPickListFieldDefinition
+            {
+                TKey = "WorkOrderTemplateEmployeeNumber",
+                FieldKey = "useremployeenumber",
+                ColumnDataType = UiFieldDataType.Text,
+                SqlValueColumnName = "auser.employeenumber"
+            });
+
+            ColumnDefinitions.Add(new AyaPickListFieldDefinition
+            {
+                TKey = "Tags",
+                FieldKey = "usertags",
+                ColumnDataType = UiFieldDataType.Tags,
+                SqlValueColumnName = "auser.tags"
+            });
+        }
+    }//eoc
+}//eons
\ No newline at end of file
diff --git a/server/AyaNova/util/AyaNovaVersion.cs b/server/AyaNova/util/AyaNovaVersion.cs
index ade1ca93..8b5f64d1 100644
--- a/server/AyaNova/util/AyaNovaVersion.cs
+++ b/server/AyaNova/util/AyaNovaVersion.cs
@@ -5,7 +5,7 @@ namespace AyaNova.Util
     /// </summary>
     internal static class AyaNovaVersion
     {
-        public const string VersionString = "8.0.0-alpha.88";
+        public const string VersionString = "8.0.0-alpha.89";
         public const string FullNameAndVersion = "AyaNova server " + VersionString;
     }//eoc
 }//eons
\ No newline at end of file