Fix requirejs issues
Add events and current match