Improved handling of multiple invoices