fixes #1597
updates to the same key at the same second will result in multiple store with the correct order
minor fix map.remove
field rename
Merge pull request #1607 from enesakar/maintenance-issue-1597

fixes #1597