[OPF#1214] Fix pagination