Updates to checkbox control to handle intermediate checkboxes