Suggestion to edit code from Country dropdown