More fixes for date filter