Support for tuple notation in the QueryBuilder

JAVA-327 #fixes