CRM-12357

fix break in activity tab and other places