Enum combining and error fixes

Fixing some error messages and combining AnswerTag and QuestionTag enums
into just Tag enum