Refs #17088; Fixed order of columns when using pre-pivot filters