fixed decrease performance issues when loading data between months
fixed conflicts