Also fix an error in determining the objects of type group. Also call `finish` to properly terminate the command, otherwise it stays active and behaves incorrectly.
