renamed a lot of the conditionquerybuilder to emphasis conditions and make it easier to recognize what it does