Convert more check boxes to the new smart control