Added search term filtering