updated content type check
removed isdescendantnode
Merge remote-tracking branch 'origin/feature/request-optimization' into feature/page-refactor