Fix for reset of date selection WIP