add support for individual collapsing flex fields.
remove todo comment, see last commit