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 #1606 from enesakar/master-issue-1597

fixes #1597