Removed workaround for subject id attribute

Also replaced isConnected with getPZHId

Jira-issue: WP-1158