final updates to query builder
Merge pull request #14 from pannellr/pannellr

final updates to query builder