Added search and pagination