Various tweaks to increase search performance.