Bug fix OOIION-1315: pagination not working properly