Fix event listener ID
Add create action