fixed pagination issue and sample issue
fixed pagination issue and sample issue