added identifier to differentiate between Primary and Secondary IDs

[egonw]

Thanks. I'll look at this asap. One note, for future patches, can you plz make the commit messages as dense as possible. For example:

That can be just the detailed message as the first and only message. Because "Update X.java" does not add information.