Added id handling for atom sets and sre namespaces.