Minor Query Builder optimizations