fixes BE-3 added logic for displaying upcoming events only