[BUGFIX] Keep unmapped ?type parameter when using PageTypeDecorator