Folders follow up

Initial follow-up, still some pending
We should also be trying with a single folder here and verify the target information and its aggregation