Fixed filter date issue