Remove debug lines
Add viewLackingSubjects
Update data classes