Use a more efficient string replace in the query builder

JAVA-67 #resolve