country select fixes