review issues fixed
clien-side incorrent pagination fix