Added filtering and heatmap.