diff --git a/server/AyaNova/PickList/UnitPickList.cs b/server/AyaNova/PickList/UnitPickList.cs
index b9e7c6ec..b8ce95a6 100644
--- a/server/AyaNova/PickList/UnitPickList.cs
+++ b/server/AyaNova/PickList/UnitPickList.cs
@@ -22,7 +22,7 @@ namespace AyaNova.PickList
             dTemplate.Add(cm);
 
             cm = new JObject();
-            cm.fld = "UnitModel";
+            cm.fld = "UnitModelModelNumber";
             dTemplate.Add(cm);
 
             cm = new JObject();
@@ -52,6 +52,24 @@ namespace AyaNova.PickList
                 IsRowId = true
             });
 
+            ColumnDefinitions.Add(new AyaPickListFieldDefinition
+            {
+                FieldKey = "UnitModelModelNumber",
+                TKey = "UnitModelModelNumber",
+                ColumnDataType = UiFieldDataType.Text,
+                SqlIdColumnName = "aunitmodel.id",
+                SqlValueColumnName = "aunitmodel.number"
+            });
+
+            ColumnDefinitions.Add(new AyaPickListFieldDefinition
+            {
+                FieldKey = "UnitModelName",
+                TKey = "UnitModelName",
+                ColumnDataType = UiFieldDataType.Text,
+                SqlIdColumnName = "aunitmodel.id",
+                SqlValueColumnName = "aunitmodel.name"
+            });
+
             ColumnDefinitions.Add(new AyaPickListFieldDefinition
             {
                 FieldKey = "UnitModelVendorID",