Huge bug fixes in event list controller