fixed the no-thread serch issue, starting with the no thread branch