Changes in for modules to support the requirements of TI

Add support for filtering by name on the orgs. WIP