[Joel]

You should be able to add things to a subgraph using the Outline Editor, and that way not need to ungroup and group as a subgraph again.