added search and filtering