added support for chaos queries