11th July 2018 - Heatmaps taking long to load