Fix the selection of events on neighbor events