Added filter to eventlist -untested