diff --git a/question_types/long_answer/long_answer.classes.inc b/question_types/long_answer/long_answer.classes.inc
index fcdb890..da9ebfe 100644
--- a/question_types/long_answer/long_answer.classes.inc
+++ b/question_types/long_answer/long_answer.classes.inc
@@ -189,11 +189,13 @@ class LongAnswerResponse extends QuizQuestionResponse {
   public static function fetchAllUnscoredAnswers($count = 50, $offset = 0) {
     global $user;
     $query = db_select('quiz_long_answer_user_answers', 'a');
-    $query->fields('a', array('result_id', 'question_nid', 'question_vid', 'answer_feedback', 'answer_feedback_format'));
+    $query->fields('a', array('answer_feedback', 'answer_feedback_format'));
     $query->fields('r', array('title'));
     $query->fields('qnr', array('time_end', 'time_start', 'uid'));
-    $query->join('node_revision', 'r', 'a.question_vid = r.vid');
-    $query->join('quiz_node_results', 'qnr', 'a.result_id = qnr.result_id');
+    $query->fields('qnra', array('result_id', 'question_nid', 'question_vid'));
+    $query->join('quiz_node_results_answers','qnra', 'a.result_answer_id = qnra.result_answer_id');
+    $query->join('node_revision', 'r', 'qnra.question_vid = r.vid');
+    $query->join('quiz_node_results', 'qnr', 'qnra.result_id = qnr.result_id');
     $query->join('node', 'n', 'qnr.nid = n.nid');
     $query->condition('a.is_evaluated', 0);
     if (user_access('score own quiz') && user_access('score taken quiz answer')) {
diff --git a/question_types/short_answer/short_answer.classes.inc b/question_types/short_answer/short_answer.classes.inc
index 0665c7f..2036841 100644
--- a/question_types/short_answer/short_answer.classes.inc
+++ b/question_types/short_answer/short_answer.classes.inc
@@ -282,11 +282,13 @@ class ShortAnswerResponse extends QuizQuestionResponse {
   public static function fetchAllUnscoredAnswers($count = 50, $offset = 0) {
     global $user;
     $query = db_select('quiz_short_answer_user_answers', 'a');
-    $query->fields('a', array('result_id', 'question_nid', 'question_vid', 'answer_feedback', 'answer_feedback_format'));
+    $query->fields('a', array('answer_feedback', 'answer_feedback_format'));
     $query->fields('r', array('title'));
     $query->fields('qnr', array('time_end', 'time_start', 'uid'));
-    $query->join('node_revision', 'r', 'a.question_vid = r.vid');
-    $query->join('quiz_node_results', 'qnr', 'a.result_id = qnr.result_id');
+    $query->fields('qnra', array('result_id', 'question_nid', 'question_vid'));
+    $query->join('quiz_node_results_answers','qnra', 'a.result_answer_id = qnra.result_answer_id');
+    $query->join('node_revision', 'r', 'qnra.question_vid = r.vid');
+    $query->join('quiz_node_results', 'qnr', 'qnra.result_id = qnr.result_id');
     $query->join('node', 'n', 'qnr.nid = n.nid');
     $query->condition('a.is_evaluated', 0);