Fixed country fetching
Merge branch 'fix-country' into develop