Updates to fix a few bugs in item group selection.