Fixes to search

Updated search with the threads layout fixes