Dc/Melanie |#4063| Fixing pagination