Fix manage-subjects and create-subject after major fuck up!!