Urgent: issues with citing a report in APA 7 if name of editor/publisher contains a comma

[Adam Smith]

Tomorrow I have a deadline, so any help is much appreciated.
According to https://academicanswers.waldenu.edu/faq/73164 I would like to cite a report (APA 7) who is edited by a organization whose name contains a comma:

Agency for Infants, Toddlers, and Children (2006). Report for Children 2006. Ministry of Health.

Unfortunately, I don't have any clue how to do this in Bookends. Which media type I should use and how do I avoid that editors name is treated as lastname and firstname separated by comma?

[Jon]

If you terminate the institutional name with a comma, Bookends will leave it as entered:

Agency for Infants, Toddlers, and Children,

Jon
Sonny Software

[Adam Smith]

Thank you so much!