Additional querybuilder fixes.