[CDE-284] - Fixed list population