First pass at fixing search.