corrected secondary paging with multiple prop modules
Merge branch 'wip'