Last fixes to answer area