Add recursion handling in reports