Topic/enhance event lists

Pushed fix. I replied to this comment in the commit for that fix.