Improve handling searches with lots of results