corrections done

jira issue: WP-1151

corrections done