Minor improvements to threaded searching