Refactor/fix uom doses disappear