Issue #995 (paging - prevent reset on edit)