Separate address and zip checks