Support "query" and "matchTo" parameters