[#69362532 #69362528] added toggle-able heatmaps

for AQE and AQS