use Content::asPage() instead of if/else
fix asPage calls
Merge branch 'editing-as-page' into editing-refactor