Merge pull request #3373 from jim-parry/userguide/querybuilder

User Guide update - Query Builder (fixes #2512)