Added toJSON to volunteer and fixed it for client