Fixed fillup date selection persistence