Event::Search cohesion

Now that we have Event::Search, move remaining search-related functionality over from Event.