Fixed issues with the selected date going back to default state.