Fix for City and Country parser