Added default values for custom city/country fields