Added lower > infinite and infinite > upper ranges.
Separated out the range queries to be able to override them better.
CS fixes