fixed all issues with querying Organization