Folders follow up

Initial follow-up, still some pending
`expected entitie