fixed all issues with getting Organization Info