Use AtomID instead of string consistently in entry