Fixed swapping of subtree nodes.  Old Subtree node should be detached.