Add more relationships to organization query