add buildQuery()
Merge branch 'develop'