final adjustments, getting rid of row range queries