reorg: query operator index and reference