fixed filtering on date range