Better search fail state (fixes #1655)