refactoring country select