query DSL taking shape