diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs
index 72cd5770..3307f62c 100644
--- a/server/AyaNova/biz/WorkOrderBiz.cs
+++ b/server/AyaNova/biz/WorkOrderBiz.cs
@@ -6015,12 +6015,19 @@ namespace AyaNova.Biz
         //  
         private async Task UnitPopulateVizFields(WorkOrderItemUnit o)
         {
-            o.UnitViz = await ct.Unit.AsNoTracking().Where(x => x.Id == o.UnitId).Select(x => x.Serial).FirstOrDefaultAsync();
+            var unitInfo = await ct.Unit.AsNoTracking().Where(x => x.Id == o.UnitId).Select(x => new { x.Serial, x.Description, x.UnitModelId }).FirstOrDefaultAsync();
+            o.UnitViz = unitInfo.Serial;
+            o.UnitDescriptionViz = unitInfo.Description;
 
-        UnitModelModelNumber
-        UnitModelVendorID
-        UnitModelName
-        UnitDescription
+            if (unitInfo.UnitModelId != null)
+            {
+                var unitModelInfo = await ct.UnitModel.AsNoTracking().Where(x => x.Id == unitInfo.UnitModelId).Select(x => new { x.Name, x.VendorId, x.Number }).FirstOrDefaultAsync();
+                o.UnitModelNameViz = unitModelInfo.Name;
+                o.UnitModelModelNumberViz = unitModelInfo.Number;
+
+                if (unitModelInfo.VendorId != null)
+                    o.UnitModelVendorViz = await ct.Vendor.AsNoTracking().Where(x => x.Id == unitModelInfo.VendorId).Select(x => x.Name).FirstOrDefaultAsync();
+            }
         }
 
         ////////////////////////////////////////////////////////////////////////////////////////////////