Handling group and stem moves