added date filtering