Fix collection mapping in report