Handling pzp with same id.

Jira issue: WP-909