That's a lot but at least there won't be any surprise with missing search results
Fixes #1936 (closed)