Adding support for a query on height matches