cargo groups selection & small improvements :boom: