Fixing year/semester deletion issues