Improved (and fixed) issue with TOF display in main plots.