improved search robustness