Fixes #12808: Correct grid column values listed in Grid Options