Full Rewrite : still queries est and range