More search performance improvements