Fix the problem seen in the Events page
Fix merge problem