Folders follow up

Initial follow-up, still some pending
We should also attempt this with a single folder and verify the target and target aggregation