Saved Search tweaks [MJ-131]

This is a much cleaner version than I had previously submitted.