Use event based search for simpler code