Fixes issue with selectable dates and ranges