CLSN-1488 Change Api queries