[WIP] Changed Quiz.query method