@martinfeld Does the newish grouping feature help with this?