[OE-4103] -  changes to sorting by event_date in places thoughtout the code base - part 2