Added scope and timebox date ranges to query