fixing a bug introduced in 1ea0ec3f and also use correct start/end time for event
requests in case of gappy streams