added in date filtering