refactor of vouchers lists