fix selected dates issue.
Merge branch 'issues/fix-selected-dates' into develop