Add Search and paginate