added date range conditions