refarctored query API, use Aql prototype
more refactoring of query builder, #39