Hoist feature query's selector
Merge pull request #618 from xzyfer/feat/hoist-feature-queries

Hoist selectors in feature queries