[IMP] fixed pagination

Merged Federico Pérez Diduch requested to merge RDSD-33 into 12.0-stage

Closes RDSD-33

Merge request reports