Rename event handlers to be inline with requests
Add data attribute to organization fields