Base filter endDate fix