Map assessments type: fix issue in validation and include functionality.