Fix checkbox grouping issue in form