Includes date filtering