Feature #6710: Use optgroups in selectorboxes