Fix overzealous search abortion