Secondpass at query DSL