Start work on fixing multi-folder search.