fix search and filter