Country selection made optional