Fix tx tracking wrt entity groups, #2.