NoSQL: Improve query builder API