BugFix on data page hierarchy