Add user_id and user_name
Merge branch 'improve-event-view'