added support for modifyQuery