Fix date filter bug