give and get voucher query fixed