fixed pagination issue
some other modify

Signed-off-by: TomWu <phperwuhan@gmail.com>