added search query and filter