Fix incorrect has many for custom fields on person and organization