Adding date filter compatibility