More work on event listing