Update query builder for for C* 2.0 new features

JAVA-140 #fixes