Fix some bugs in the new guided finder based on testing with Jeebiss