Index: openacs-4/packages/acs-templating/tcl/widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/widget-procs.tcl,v
diff -u -N -r1.52.2.4 -r1.52.2.5
--- openacs-4/packages/acs-templating/tcl/widget-procs.tcl	26 Oct 2015 09:11:30 -0000	1.52.2.4
+++ openacs-4/packages/acs-templating/tcl/widget-procs.tcl	24 Feb 2016 12:19:26 -0000	1.52.2.5
@@ -700,16 +700,16 @@
                 append output ">\n"
 
                 foreach option $options_list {
+                    lassign $option label value
 
-                    set label [lindex $option 0]
-                    set value [lindex $option 1]
-
-                    append output [subst { <option value="[ns_quotehtml $value]"}]
+                    append output [subst { <option value="[ns_quotehtml $value]"}] \
                     if { [info exists values($value)] } {
                         append output [subst { selected="selected"}]
                     }
-
-                    append output [subst {>[ns_quotehtml $label]</option>\n}]
+                    # Whe option element contains "normal" character data,
+                    # which must not contain any "<". For details, see:
+                    # https://www.w3.org/TR/html-markup/syntax.html#normal-character-data
+                    append output [subst {>[string map {< "&lt;" > "&gt;"} $label]</option>\n}]
                 }
                 append output "</select>"
             }