Fixing City and country default values