Remove 'Timestamp' from quartz column headers and fix #984