Model fixes for Questions and Answers