added search and filters