Fix issue #1273 and some cleanup in Query Builder
2 files changed