Events list fix
Resolved merge conflict between local dev branch and Kristof's revised code.
Merge branch 'mike'