App-schema refactor while working on paging. All online tests now passed
with paging changes.