add support for query target