Solved calendar issues, in back end and front end