Fixed issue with heatmaps overlayed with old/previous data