Country view enhancement
Merge branch 'enhancement-#33' into develop