[BUGFIX] Streamline PageTypeDecorator handling