Improve searching.