RF-13501: fix API calls