decoder: update to fix column order