fix calendar error, better event count