More work on fixing search