Improve handling of timestamps when no end time supplied