CRM-13179 fix event to 'listen' to contact id as set
CRM-13179 a few fixes lost in gitting re-instated