Work on fixing search.