More complex query builder logic is the price of correct queries.
Merge branch 'master' into gh-pages