added entities for query fields
added rightanswer entity