Builder fixes
Merge pull request #1638 from Cinderella-Man/2.0.0-builder-fixes

[2.0.0] Query Builder fixes