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