[#64497136] Updated adhoc products to handle quantity correct. Cleaned up code.