Fix issues with retrieving the user events
Merge branch 'feature/retrieve-user-events'