*Removed unused module
*Added search for multiple terms