Add additional check for date range filter