Setting multiple values for CheckboxGroup fixed
Small fixes and code reorganization