Query Building #3

Closed
cerys wants to merge 3 commits from query-building into master