Folders follow up

Initial follow-up, still some pending
`... preview has been update`