add support for more types of queries