Improvements to searching.