Enhanced Voucher Selection (GP v18.6)