Query grammar should not explode segments on alias
Merge pull request #5837 from bishopb/4.2

Query grammar should not explode segments on alias