Fixed appId extraction

Jira-issue: WP-1075