Evaluation services improvements (PLFM-1770, 1774, 1775)