fixed pagination issue
Merge pull request #2672 from ten24/feature-ds-pagingNavIssue

fixed pagination issue