correct calendar entries and sorting