fixed unique id and timestamp replacement issue