Remove useless update in controller
Fix calendar boundaries