Slightly better search with the search-event