performance tune, fix column ordering