WF-1606 - Fixed substitute and description validations