Adjust calendar when available dates are loaded
Merge branch 'bugfix-calendar'