Fixed isssue with PageId set to 0