Add basic search and pagination