Range Query modified