Fixed services and APIs discovery

Jira-issue: WP-1296