Add `modifiers` property to Query constructor
Reapply selector stub tests