Make search more error tolerant