Modify some regex, and zipcode find logic