fixing pagination issue, updated support libs