Update radio and checkbox due to e3801fbf6bdf167c31f4f2bbb774f75659956d57