Index: openacs-4/packages/xowf/lib/inclass-exam.wf
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/lib/inclass-exam.wf,v
diff -u -r1.1.2.90 -r1.1.2.91
--- openacs-4/packages/xowf/lib/inclass-exam.wf	31 Jan 2022 13:36:52 -0000	1.1.2.90
+++ openacs-4/packages/xowf/lib/inclass-exam.wf	31 Jan 2022 15:25:59 -0000	1.1.2.91
@@ -560,9 +560,9 @@
     set as_student [:query_parameter as_student:boolean false]
     set d [:AM render_answers \
                -as_student    $as_student \
-               -filter_id     [:query_parameter id:int32 ""] \
                -creation_user [:query_parameter creation_user:int32 ""] \
                -revision_id   [:query_parameter rid:int32 ""] \
+               -filter_submission_id  [:query_parameter id:int32 ""] \
                -filter_form_ids [:query_parameter fos:int32 ""] \
                -export        [:query_parameter export:boolean 0] \
                -orderby       [:query_parameter orderby:token "online-exam-userName"] \
Index: openacs-4/packages/xowf/lib/online-exam.wf
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/lib/online-exam.wf,v
diff -u -r1.6.2.28 -r1.6.2.29
--- openacs-4/packages/xowf/lib/online-exam.wf	9 Jan 2022 20:46:52 -0000	1.6.2.28
+++ openacs-4/packages/xowf/lib/online-exam.wf	31 Jan 2022 15:25:59 -0000	1.6.2.29
@@ -325,7 +325,7 @@
                                ? [dict get ${:instance_attributes} signature]
                                : 0 }]
       set examTitle ${:title}
-      set filter_id [[$wf package_id] query_parameter id:integer ""]
+      set filter_submission_id [[$wf package_id] query_parameter id:integer ""]
 
       foreach i [$items children] {
         $i set online-exam-userName [acs_user::get_element -user_id [$i creation_user] -element username]
@@ -340,7 +340,7 @@
           ns_log notice "online-exam: submission of $userName is not finished (state [$i state])"
           continue
         }
-        if {$filter_id ne "" && [$i item_id] ne $filter_id} {
+        if {$filter_submission_id ne "" && [$i item_id] ne $filter_submission_id} {
           continue
         }
 
Index: openacs-4/packages/xowf/tcl/test-item-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/test-item-procs.tcl,v
diff -u -r1.7.2.209 -r1.7.2.210
--- openacs-4/packages/xowf/tcl/test-item-procs.tcl	31 Jan 2022 13:15:42 -0000	1.7.2.209
+++ openacs-4/packages/xowf/tcl/test-item-procs.tcl	31 Jan 2022 15:25:59 -0000	1.7.2.210
@@ -2947,7 +2947,7 @@
     #----------------------------------------------------------------------
     :method submissions {
       {-creation_user:integer,0..1 ""}
-      {-filter_id:integer,0..1 ""}
+      {-filter_submission_id:integer,0..1 ""}
       {-revision_id:integer,0..1 ""}
       {-wf:object}
     } {
@@ -2966,7 +2966,7 @@
       } else {
         set submissions [:get_wf_instances \
                              {*}[expr {$creation_user ne "" ? "-creation_user $creation_user" : ""}] \
-                             {*}[expr {$filter_id ne "" ? "-item_id $filter_id" : ""}] \
+                             {*}[expr {$filter_submission_id ne "" ? "-item_id $filter_submission_id" : ""}] \
                              $wf]
       }
 
@@ -3313,7 +3313,7 @@
       {-combined_form_info}
       {-examWf:object}
       {-exam_question_dict}
-      {-filter_id:integer,0..1 ""}
+      {-filter_submission_id:integer,0..1 ""}
       {-filter_form_ids:integer,0..n ""}
       {-grading_scheme:object}
       {-recutil:object,0..1 ""}
@@ -3446,7 +3446,7 @@
       # If we filter by student and the exam is proctored, display
       # the procoring images as well.
       #
-      if {$filter_id ne "" && [$examWf property proctoring] eq "t"} {
+      if {$filter_submission_id ne "" && [$examWf property proctoring] eq "t"} {
         set markup [:render_proctor_images \
                         -submission $submission \
                         -revisions $revisions \
@@ -3558,7 +3558,7 @@
     #----------------------------------------------------------------------
     :public method render_answers {
       {-as_student:boolean false}
-      {-filter_id:integer,0..1 ""}
+      {-filter_submission_id:integer,0..1 ""}
       {-creation_user:integer,0..1 ""}
       {-revision_id:integer,0..1 ""}
       {-filter_form_ids:integer,0..n ""}
@@ -3603,7 +3603,7 @@
 
       set items [:submissions \
                      -creation_user $creation_user \
-                     -filter_id $filter_id \
+                     -filter_submission_id $filter_submission_id \
                      -revision_id $revision_id \
                      -wf $wf]
       #
@@ -3639,7 +3639,7 @@
         # Provide the full protocol (or a subset of it)
         #
         append HTML "<h2>#xowf.online-exam-protocol#</h2>\n"
-        if {$filter_id ne ""} {
+        if {$filter_submission_id ne ""} {
           set runtime_panel_view "revision_overview"
         } else {
           set runtime_panel_view "default"
@@ -3671,7 +3671,7 @@
         set recutil [:recutil_create \
                          -clear \
                          -exam_id [$wf parent_id] \
-                         -fn [expr {$filter_id eq "" ? "all.rec" : "$filter_id.rec"}]
+                         -fn [expr {$filter_submission_id eq "" ? "all.rec" : "$filter_submission_id.rec"}]
                     ]
       } else {
         set recutil ""
@@ -3720,7 +3720,7 @@
                    -exam_question_dict $question_dict \
                    -autograde $autograde \
                    -combined_form_info $combined_form_info \
-                   -filter_id $filter_id \
+                   -filter_submission_id $filter_submission_id \
                    -filter_form_ids $filter_form_ids \
                    -grading_scheme $grading_scheme \
                    -recutil $recutil \
@@ -3784,7 +3784,7 @@
         if {[llength $filter_form_ids] > 0} {
           set fos $filter_form_ids
         }
-        foreach value {revision_id filter_id} var {rid id} {
+        foreach value {revision_id filter_submission_id} var {rid id} {
           if {[set $value] ne ""} {
             set $var [set $value]
           }
@@ -3808,7 +3808,7 @@
       # might be partially relaxed in the future.
       #
       if {$with_grading_table
-          && !$as_student && $filter_id eq "" && $creation_user eq "" && $revision_id eq ""
+          && !$as_student && $filter_submission_id eq "" && $creation_user eq "" && $revision_id eq ""
         } {
         set statistics {}
         set ia [$examWf instance_attributes]