Fix column reordering not working for headers.