Added support for match queries.