diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index b539c72554..0db6521d27 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -569,6 +569,10 @@ class @CombinedOpenEnded
     @question_header.text(new_text)
     return false
 
+  hide_rubrics: () =>
+    @$(combined_rubric_sel + ' > [data-status="hidden"]').hide()
+    @$(combined_rubric_sel + ' > [data-status="shown"]').show()
+
   prompt_show: () =>
     if @prompt_container.is(":hidden")==true
       @prompt_container.slideToggle()
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
index ae3d01c686..ad9d7a287f 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
@@ -506,22 +506,20 @@ class CombinedOpenEndedV1Module():
         for i in xrange(0, loop_up_to_task):
             response = self.get_last_response(i)
             rubric_scores = None
-            if len(response['rubric_scores']) > 0 and response['grader_types'][0] in HUMAN_GRADER_TYPE.keys():
-                rubric_scores = [response['rubric_scores']]
-            grader_types = None
-            if len(response['grader_types']) > 0 and response['grader_types'][0] in HUMAN_GRADER_TYPE.keys():
-                grader_types = [response['grader_types']]
-            feedback_items = None
-            if len(response['feedback_items']) > 0 and response['grader_types'][0] in HUMAN_GRADER_TYPE.keys():
-                feedback_items = [response['feedback_items']]
-            if feedback_items is not None and grader_types is not None and rubric_scores is not None:
-                rubric_html = self.rubric_renderer.render_combined_rubric(stringify_children(self.static_data['rubric']),
-                                                                      rubric_scores,
-                                                                      grader_types, feedback_items)
-                contexts.append({
-                    'result': rubric_html,
-                    'task_name': 'Scored rubric'
-                })
+            score_length = len(response['grader_types'])
+            log.info(response)
+            for z in xrange(0,score_length):
+                if response['grader_types'][z] in HUMAN_GRADER_TYPE.keys():
+                    rubric_scores = [[response['rubric_scores'][z]]]
+                    grader_types = [[response['grader_types'][z]]]
+                    feedback_items = [[response['feedback_items'][z]]]
+                    rubric_html = self.rubric_renderer.render_combined_rubric(stringify_children(self.static_data['rubric']),
+                                                                          rubric_scores,
+                                                                          grader_types, feedback_items)
+                    contexts.append({
+                        'result': rubric_html,
+                        'task_name': 'Scored rubric'
+                    })
 
         context = {
             'results': contexts,
diff --git a/lms/templates/combinedopenended/combined_open_ended_results.html b/lms/templates/combinedopenended/combined_open_ended_results.html
index 84f186fbb6..24934be3d2 100644
--- a/lms/templates/combinedopenended/combined_open_ended_results.html
+++ b/lms/templates/combinedopenended/combined_open_ended_results.html
@@ -2,9 +2,9 @@
     % if 'task_name' in result and 'result' in result:
         <div class="combined-rubric-container"
         %if i>0:
-            status="shown">
+            data-status="shown" data-number="${i}">
         % else:
-            status="hidden">
+            data-status="hidden" data-number="${i}">
         % endif
             <h4>${result['task_name']} from grader ${i+1} <a class="rubric-collapse" href="#">(Hide)</a></h4>
             ${result['result'] | n}