Added better filtering and sorting to events list