add pagination and search