fixed add and remove eventlisteners

jira issue: WP-1085

Add Remove Listeners fixed