Little fix on the checkbox logic so the checkboxes are checked by default