Update to knock out data values rather than dates themselves for 'future' dates