Simplified select best thread (#958)