AnswerHandler bugfixes