Add date filtering on query