Added SAON to grouping key. Fix for issue #47. Also removed grouping headers