fix to test
add query builder
Merge pull request #2 from unepwcmc/query_builder

Query builder