SearchGoal impl. fixes