Fixed clear data behavior with heatmaps and archival data.
Merge branch 'Live'