Code refactoring.
Use UID as main identifier for HCard.