CRM-15172 - Refactor forms to use addChainSelect method