Take the expanded event list into account