Added search and filtering capability