fix search performance (and possibly results?), RT#25985, RT#25687