Fix event/message listing