change grade to semester and fix search bug