Update optimizer to avoid putting window functions in group by

Update optimizer to avoid putting window functions in group by #797