Topic/enhance event lists

Done, works, pushed fix.