pagination and search fixed
merge conflicts