PLFM-2043: switch to flat columns for new Evaluation fields