CRM-19487 Tidy up contact reports to fix contact subtype not displaying