#802: Events Module search update