Fix context queries with new-style dsl