Add search for instructor, semester; temp fix for edge decoupling