Improvements on event index