Resolved issues in event-page mapping