Added search and filter, pagination