Marc: Bugs fixed to Invoice dropdown