Charts: Fixes for heatmaps