Fixed unfolding.
WIP - multipart support [ci skip].