improved search performance with large result sets - close #656