Fixed some issues related to the semantic paging change.