Search Improvements

by Ann Foo