Added search and paging.