Bugfix tf479 remove unnecessary pagination