Country highlight implemented with Heatmap also. Code refactoring