Comment 2 for bug 1968754

The top two commits on this branch should resolve this issue: user/sandbergja/lp1968754_instructor_search

It also includes a handful of tests to hopefully prevent some regressions in this feature.