Expanded previous search function.

Allows for multiple key words and refined searches.