Fix Group By & Order By to co-exist when header is selected