Long events aren't displayed properly when using Container (#15242)

Rewrote event selection.

Change-Id: I8f0dd1c5ec736ea14037619b1656a79b7e3532be