Move updateSortArrow call to prevent issues with customized header cells
Fix Pagination regression on sort due to null beforeNode