add updated field and remove second heatmap
reduce number of SQL queries