Answers Populator component improved