Refactoring
Added default option for country list/selection