cell allginment fix, group-by fix