fixes #205
fixes #199
Fixed pagination issues. fixes #206