Added search and filter options