Vinay | #1106 | Always save quantity units as Unit(s)