Adjust phone number matching #686