Tweak to volunteer quick lookup, adding more search criteria