added functionality to both search AND filter at same time