Added boolean for disable ZipCode