Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -N -r1.284.2.154 -r1.284.2.155
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	26 Mar 2021 11:39:22 -0000	1.284.2.154
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	29 Mar 2021 08:31:37 -0000	1.284.2.155
@@ -4191,8 +4191,10 @@
   }
 
   enumeration instproc make_correct {} {
-    set :value ${:answer_value}
-    #ns_log notice "???? make_correct sets value ${:answer_value}"
+    if {[info exists :answer_value]} {
+      set :value ${:answer_value}
+      #ns_log notice "???? make_correct sets value ${:answer_value}"
+    }
   }
 
   enumeration instproc add_statistics {{-options ""}} {
@@ -4790,7 +4792,12 @@
           dict set labels $rep serial [incr count]
         }
         if {${:keep_order}} {
-          set selected ${:value}
+          set selected [lmap v ${:value} {
+            if {$v ni $selected} {
+              continue
+            }
+            set _ $v
+          }]
         }
 
         html::div -class candidate-selection -id ${:id} {
@@ -5855,7 +5862,7 @@
 
   ###########################################################
   #
-  # ::xowiki::boolean-checkox
+  # ::xowiki::boolean_checkox
   #
   ###########################################################