pagination and search added