For ENG-5311 Checkpoint a bug fix, was skipping populating the rest of the ids