Dealing with an issue with Date Range filter