make choose date work well