Change until to upto in sponsor, and fix the finders