Qsearch simplification. (#1828)