CRM-14199 Improvements 

https://issues.civicrm.org/jira/browse/CRM-14199