Added additional search capabilities
Added additional search capabilities