make whereRaw & havingRaw consistent