[#76] Some bugfixes in calendar helper