date filter almost there