diff --git a/server/AyaNova/PickList/UnitPickList.cs b/server/AyaNova/PickList/UnitPickList.cs
index b8ce95a6..4728ba59 100644
--- a/server/AyaNova/PickList/UnitPickList.cs
+++ b/server/AyaNova/PickList/UnitPickList.cs
@@ -29,6 +29,10 @@ namespace AyaNova.PickList
             cm.fld = "UnitModelVendorID";
             dTemplate.Add(cm);
 
+            cm = new JObject();
+            cm.fld = "Tags";
+            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
@@ -122,7 +126,7 @@ namespace AyaNova.PickList
             ColumnDefinitions.Add(new AyaPickListFieldDefinition
             {
                 TKey = "Tags",
-                FieldKey = "unittags",
+                FieldKey = "Tags",
                 ColumnDataType = UiFieldDataType.Tags,
                 SqlValueColumnName = "aunit.tags"
             });