Updates to pagination, refs #6234