diff --git a/rapids/templates/rapids/exam_scores.html b/rapids/templates/rapids/exam_scores.html
index bd9fd93b..7c9c70fc 100644
--- a/rapids/templates/rapids/exam_scores.html
+++ b/rapids/templates/rapids/exam_scores.html
@@ -41,7 +41,7 @@
         </table>
     </div>
     <div>
-        <h3>Answers as a table TEST</h3>
+        <h3>Answers as a table</h3>
         <table class="table table-dark table-striped table-hover table-sm col-sm">
             <thead class="thead-dark">
                 <tr>
@@ -62,15 +62,15 @@
                             [A]
                         {% endif %}
                     </td>
-                    {% for cid in cids %}
-                        <td class="rapid-ans user-answer-score-{{score_by_question|get_item:question|get_item:cid}}" title="answer score: {{score_by_question|get_item:question|get_item:cid}}">{{ans_by_question|get_item:question|get_item:cid}}</td>
+                    {% for ans, score in by_question|get_item:question %}
+                        <td class="rapid-ans user-answer-score-{{score}}" title="answer score: {{score}}">{{ans}}</td>
                     {% endfor %}
                 </tr>
             {% endfor %}
             <tr>
                 <td>Score:</td>
-                {% for cid in cids %}
-                    <td>{{user_scores|get_item:cid}}</td>
+                {% for score in user_scores_list %}
+                    <td>{{score}}</td>
                 {% endfor %}
             </tr>
         </table>