Better handling/sorting of calendar events