Ensure that we are using field machine name instead of view field id.

Nia Kathonirequested to merge
issue/charts-3273720:3273720-follow-up-issue into 5.0.x

Closes #3273720

Merge request reports