Saved Search tweaks [MJ-131]

I munged indenting a bit, but I did my best to fix it.