Bug Fixes after adding Answers table