Fixed some search-related regressions.