Add names to show context for individual and organisation
No need for blank responsible party in template