Added some controls on calendar_dates