add more commit filter design, fix calendar offset