Fix solo volunteers
Add support for new fiels