Make the checkbox selection code group aware