Added select entity support for Orgs