Some minor changes for being more precise when selecting the price span. Optimizations