voucher fixes using joins