Query builder getters/setters

UT to be rebased in a sec

config ...

Spaces to tabs