Improve handling of voucher sales at the same time as public sales