PTS-24 fixed issue with checkboxes not always being saved