use unique id in atom entry. let's see how much this commit breaks the updates...