Fix for maintaining the entry id in the file

Reviewer: Mae Turiana (post commit)

Issue: GCP-10054