Refactor the agent name and contact forms to use the shared/subrecord_form behaviour - fixes bug whereby names, contacts could be sorted;