Change event scope
Change event order back
Sanitize API controllers, handle errors