Function applied in only Country Ranking
Country fix
Merge branch 'enhancement-#71' into develop