add support for a generic query