More work with search.