Enricher now correctly uses hasPage and hasEditionPage