Improved the forms
Temporary fix for record not uniq error in subject_entries