Removing diag
Fixing pagination issues