Improve the search performance and fix the bug with titles.