Generalize and simplify the query language

Duplicate of #3560

---

Migrated from T4613 (view on Phabricator)