Found a better way to handle timestamp bug of the auto-added work items without screwing up the manually added