Updated form to accept any location (not just zip)