Fix handling of outer GroupingFunc within subqueries

Fix handling of outer GroupingFunc within subqueries

Edit