Date and filtering bugs