Feature/hotfix 67

Fix Issue #67. Move additional paging state into Cursor.