Fix bug with content being populated with incorrect order.
Testing Done:
Issue Number:
Approved by:
Reviewed by: