added support for Query Modifiers.