Add date filtering and