Correctly handle nested feature queries
Merge pull request #626 from xzyfer/fix/nested-feature-queries

Correctly handle nested feature queries