PLFM-1675: Fixed Submission constraints