Fix option list box
Fix group form selectors