#6 finalise fixes for pagination