Fixed labeling issues (now id nodes separate from labels)