Fixing issue with data-comp and event listeners