Updated country-views to use new array-based results to maintain order