Fixing heatmap dates so that dates in the future are no longer shown
Suggestions now exist on the new metric form