fix paging semantics
update to MR v7