Added fixes for single country select