IDEX-541: ws getByOrganization replaced with getByAccount