Basic changes for HeatMap queries