Country selection improved