Saved search widget bug fixes [MJ-839/MJ-948]

~~Tests don't pass, but the same tests that are failing for me (and Jenkins!) now are also failing for me on master and every other branch that I can bring up. I'm opening up this pull request in hopes that someone can restore my sanity.~~

All tests pass.

No idea what's going on here, though, since the only difference between Jenkins build 91 and 93 is comments.