BS-6798, Fixed pagination problem (20 by default)