diff --git a/_bootstrap/index.php b/_bootstrap/index.php
index 285efbe..939385a 100644
--- a/_bootstrap/index.php
+++ b/_bootstrap/index.php
@@ -95,6 +95,15 @@
 ], 'name', true)) {
     echo "Error creating MagicPreview Plugin.\n";
 }
+
+if (!createObject('modSnippet', [
+    'name' => 'mpField',
+    'description' => 'Returns click-to-field data attributes for a resource field or TV.',
+    'static' => true,
+    'static_file' => $componentPath.'/core/components/magicpreview/elements/snippets/mpfield.snippet.php',
+], 'name', true)) {
+    echo "Error creating mpField snippet.\n";
+}
 $vcPlugin = $modx->getObject('modPlugin', ['name' => 'MagicPreview']);
 if ($vcPlugin) {
     if (!createObject('modPluginEvent', [
@@ -127,7 +136,7 @@
     }
     if (!createObject('modPluginEvent', [
         'pluginid' => $vcPlugin->get('id'),
-        'event' => 'OnWebPagePrerender',
+        'event' => 'ContentBlocks_BeforeParse',
         'priority' => 0,
     ], ['pluginid','event'], false)) {
         echo "Error creating modPluginEvent.\n";
@@ -139,6 +148,24 @@
     ], ['pluginid','event'], false)) {
         echo "Error creating modPluginEvent.\n";
     }
+
+    // Drop event registrations older versions created that are no longer
+    // handled. Mirrors _build/resolvers/staleevents.resolver.php, which does
+    // the same on package upgrade -- keep the two lists in step.
+    $staleEvents = [
+        'OnWebPagePrerender',
+        'OnWebPageComplete',
+    ];
+    foreach ($staleEvents as $staleEvent) {
+        $stalePluginEvent = $modx->getObject('modPluginEvent', [
+            'pluginid' => $vcPlugin->get('id'),
+            'event' => $staleEvent,
+        ]);
+        if ($stalePluginEvent) {
+            $stalePluginEvent->remove();
+            echo "Removed stale modPluginEvent {$staleEvent}.\n";
+        }
+    }
 }
 
 
diff --git a/_build/build.transport.php b/_build/build.transport.php
index ec048a1..dab90cb 100644
--- a/_build/build.transport.php
+++ b/_build/build.transport.php
@@ -23,7 +23,7 @@ function getSnippetContent($filename = '') {
     /* define version */
     define('PKG_NAME','MagicPreview');
     define('PKG_NAME_LOWER',strtolower(PKG_NAME));
-    define('PKG_VERSION','1.7.1');
+    define('PKG_VERSION','1.8.0');
     define('PKG_RELEASE','pl');
 
     /* load modx */
@@ -89,6 +89,10 @@ function getSnippetContent($filename = '') {
                 'type' => 'php',
                 'source' => $sources['resolvers'] . 'customevents.resolver.php',
             ],
+            [
+                'type' => 'php',
+                'source' => $sources['resolvers'] . 'staleevents.resolver.php',
+            ],
         ]
     ]
 );
@@ -142,6 +146,21 @@ function getSnippetContent($filename = '') {
 $modx->log(modX::LOG_LEVEL_INFO,'Packaged in '.count($plugins).' plugins.'); flush();
 unset($plugins,$plugin,$attributes);
 
+/* add snippets */
+$snippets = include $sources['data'] . 'transport.snippets.php';
+if (!is_array($snippets)) { $modx->log(modX::LOG_LEVEL_FATAL,'Adding snippets failed.'); }
+$attributes= [
+    xPDOTransport::UNIQUE_KEY => 'name',
+    xPDOTransport::PRESERVE_KEYS => false,
+    xPDOTransport::UPDATE_OBJECT => true,
+];
+foreach ($snippets as $snippet) {
+    $vehicle = $builder->createVehicle($snippet, $attributes);
+    $builder->putVehicle($vehicle);
+}
+$modx->log(modX::LOG_LEVEL_INFO,'Packaged in '.count($snippets).' snippets.'); flush();
+unset($snippets,$snippet,$attributes);
+
 
 /* now pack in the license file, readme and setup options */
 $builder->setPackageAttributes([
diff --git a/_build/data/transport.snippets.php b/_build/data/transport.snippets.php
new file mode 100644
index 0000000..7f87c7b
--- /dev/null
+++ b/_build/data/transport.snippets.php
@@ -0,0 +1,13 @@
+<?php
+$snippets = [];
+
+$snippets[0] = $modx->newObject('modSnippet');
+$snippets[0]->fromArray([
+    'id' => 1,
+    'name' => 'mpField',
+    'description' => 'Returns click-to-field data attributes for a resource field or TV.',
+    'snippet' => getSnippetContent($sources['snippets'] . 'mpfield.snippet.php'),
+    'category' => 0,
+], '', true, true);
+
+return $snippets;
diff --git a/_build/events/events.magicpreview.php b/_build/events/events.magicpreview.php
index 2d87a8e..3aa0d85 100644
--- a/_build/events/events.magicpreview.php
+++ b/_build/events/events.magicpreview.php
@@ -7,7 +7,7 @@
     'OnDocFormSave',
     'OnLoadWebDocument',
     'OnManagerPageBeforeRender',
-    'OnWebPagePrerender',
+    'ContentBlocks_BeforeParse',
     'ContentBlocks_AfterParse',
 ];
 
diff --git a/_build/resolvers/staleevents.resolver.php b/_build/resolvers/staleevents.resolver.php
new file mode 100644
index 0000000..909d76b
--- /dev/null
+++ b/_build/resolvers/staleevents.resolver.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Removes plugin event registrations that older MagicPreview versions created
+ * but current versions no longer use.
+ *
+ * The plugin vehicle registers PluginEvents with UPDATE_OBJECT => false, so
+ * dropping an event from the package does not delete an existing row. Without
+ * this, an upgraded install keeps firing the MagicPreview plugin on every
+ * front-end page render for OnWebPagePrerender, which no longer has a handler.
+ *
+ * @var modX $modx
+ * @var modTransportPackage $transport
+ * @var array $options
+ */
+if ($transport->xpdo) {
+    $modx = $transport->xpdo;
+
+    $staleEvents = [
+        'OnWebPagePrerender',
+        'OnWebPageComplete',
+    ];
+
+    switch ($options[xPDOTransport::PACKAGE_ACTION]) {
+        case xPDOTransport::ACTION_UPGRADE:
+            $plugin = $modx->getObject('modPlugin', ['name' => 'MagicPreview']);
+            if ($plugin) {
+                foreach ($staleEvents as $eventName) {
+                    $pluginEvent = $modx->getObject('modPluginEvent', [
+                        'pluginid' => $plugin->get('id'),
+                        'event' => $eventName,
+                    ]);
+                    if ($pluginEvent) {
+                        $pluginEvent->remove();
+                    }
+                }
+            }
+
+            break;
+    }
+}
+return true;
diff --git a/core/components/magicpreview/docs/changelog.txt b/core/components/magicpreview/docs/changelog.txt
index efa262d..b7942d9 100644
--- a/core/components/magicpreview/docs/changelog.txt
+++ b/core/components/magicpreview/docs/changelog.txt
@@ -1,3 +1,15 @@
+MagicPreview 1.8.0-pl
+---------------------
+Released on 2026-08-14
+
+- Fix click_to_field breaking Fenom (and any other custom parser) output in previews. MagicPreview no longer replaces the MODX parser during a preview render. (#55)
+- BREAKING: core resource fields and TVs are no longer marked clickable automatically. Mark them in your template with the new mpField snippet, e.g. <h1 [[mpField? &name=`pagetitle`]]>[[*pagetitle]]</h1>
+- Add mpField snippet, usable as a MODX tag or a Fenom modifier ({'pagetitle'|mpField})
+- Add [[+mpClickToFieldAttributes]] / {$mpClickToFieldAttributes} placeholder for ContentBlocks field templates, so the attributes can go on your own element instead of an added wrapper. This also gives @PDO_FILE field templates a click target for the first time.
+- ContentBlocks fields keep their automatic wrapper unless the template uses the placeholder
+- Strip the ContentBlocks placeholder on every save, not only during a preview, so it is never stored in the resource content
+- Only replace the parser during preview generation when ContentBlocks marking actually needs it
+
 MagicPreview 1.7.1-pl
 ---------------------
 Released on 2026-07-10
diff --git a/core/components/magicpreview/docs/readme.txt b/core/components/magicpreview/docs/readme.txt
index 7509dd4..8f6cbb3 100644
--- a/core/components/magicpreview/docs/readme.txt
+++ b/core/components/magicpreview/docs/readme.txt
@@ -161,3 +161,39 @@ Support & Documentation
 -----------------------
 
 Full documentation is available at: https://www.modmore.com/extras/magicpreview/
+
+Click to Field
+--------------
+
+With the magicpreview.click_to_field system setting enabled, clicking part of the
+preview scrolls the resource form to the matching field.
+
+MagicPreview does not guess where your fields are rendered - you mark them.
+
+Core resource fields and TVs, with the mpField snippet:
+
+    <h1 [[mpField? &name=`pagetitle`]]>[[*pagetitle]]</h1>
+    <div [[mpField? &name=`mytv`]]>[[*mytv]]</div>
+
+With pdoTools/Fenom, any of these work:
+
+    <h1 {'pagetitle' | mpField}>{$_modx->resource.pagetitle}</h1>
+    <h1 {'mpField' | snippet: ['name' => 'pagetitle']}>...</h1>
+
+ContentBlocks fields are wrapped automatically and need no changes. To place the
+attributes on your own element instead, use the placeholder - the wrapper is then
+skipped for that field:
+
+    <h2 [[+mpClickToFieldAttributes]]>[[+value]]</h2>
+    <h2 {$mpClickToFieldAttributes}>{$value}</h2>
+
+ContentBlocks field templates using @CHUNK are a special case: parse() passes the
+field data to the chunk as properties, so write the attributes directly:
+
+    <h2 data-magicpreview-field="[[+field]]" data-magicpreview-idx="[[+field_type_idx]]">
+
+The snippet and placeholder produce nothing outside a manager preview, so they are
+safe to leave in live templates and do not appear on public share links. Outside a
+preview the ContentBlocks placeholder is removed as the field is parsed, so it is
+not stored in the resource content either. The @CHUNK form above is the exception:
+its attributes are written by hand and are always present in the saved content.
diff --git a/core/components/magicpreview/elements/plugins/magicpreview.plugin.php b/core/components/magicpreview/elements/plugins/magicpreview.plugin.php
index 517cb44..136ed20 100644
--- a/core/components/magicpreview/elements/plugins/magicpreview.plugin.php
+++ b/core/components/magicpreview/elements/plugins/magicpreview.plugin.php
@@ -14,6 +14,8 @@
     define('MAGICPREVIEW_FILTER_ALLOW', 'Allow Listed Only');
     define('MAGICPREVIEW_RESOURCE_ENABLED', 'Yes');
     define('MAGICPREVIEW_RESOURCE_DISABLED', 'No');
+    define('MAGICPREVIEW_CB_PLACEHOLDER_MODX', '[[+mpClickToFieldAttributes]]');
+    define('MAGICPREVIEW_CB_PLACEHOLDER_FENOM', '{$mpClickToFieldAttributes}');
 }
 
 $path = $modx->getOption('magicpreview.core_path', null, $modx->getOption('core_path') . 'components/magicpreview/');
@@ -266,17 +268,15 @@
             $service->applyPreviewData($modx->resource, $data);
         }
 
-        if ($modx->getOption('magicpreview.click_to_field', null, false)) {
-            // No restoration needed — the request ends after the page is rendered.
-            $modx->getParser();
-            if (!class_exists('MagicPreviewCoreParser', false)) {
-                require_once $service->config['modelPath'] . 'magicpreview/MagicPreviewCoreParser.class.php';
-            }
-            $modx->parser = new MagicPreviewCoreParser($modx);
-
+        if ($service->isClickToFieldActive()) {
             $modx->regClientStartupHTMLBlock('<style>
 [data-magicpreview-field]{cursor:pointer;}
 [data-magicpreview-field]:hover{outline:2px dashed rgba(52,152,219,0.6);outline-offset:2px;}
+/* The ContentBlocks wrapper is display:contents, so it generates no box and the
+   rule above has nothing to paint on. Outline its children instead, and only for
+   the innermost wrapper under the cursor so nested layouts match what a click
+   actually targets (the handler uses closest()). */
+.mmmp-cb-field:hover:not(:has(.mmmp-cb-field:hover))>*{outline:2px dashed rgba(52,152,219,0.6);outline-offset:2px;}
 </style>
 <script>
 document.addEventListener("click",function(e){
@@ -291,6 +291,49 @@
 
         break;
 
+    case 'ContentBlocks_BeforeParse':
+        /**
+         * @var string $tpl Field template, before ContentBlocks parses it
+         * @var array $phs Field data: 'field' (id), 'field_type_idx', settings
+         *
+         * Resolves the click-to-field placeholder so the template author can put
+         * the attributes on their own element instead of receiving the automatic
+         * wrapper. Fires for every ContentBlocks template style that reaches
+         * parse(), including @PDO_FILE, which returns before
+         * ContentBlocks_AfterParse and therefore never gets a wrapper.
+         *
+         * The placeholder is resolved on every parse, not only during a preview:
+         * ContentBlocks writes generateHtml() output straight into the resource
+         * content column, so on a normal save an unresolved placeholder would be
+         * stored there verbatim. It never renders (MODX drops unresolved tags on
+         * the final parse pass, and Fenom renders an undefined variable empty),
+         * but anything reading content directly would see it. Outside a preview
+         * it therefore resolves to an empty string.
+         */
+        if (!is_string($tpl)
+            || (strpos($tpl, MAGICPREVIEW_CB_PLACEHOLDER_MODX) === false
+                && strpos($tpl, MAGICPREVIEW_CB_PLACEHOLDER_FENOM) === false)) {
+            // Template did not opt in; the automatic wrapper still applies.
+            break;
+        }
+        $mpAttrs = '';
+        // addFieldMarkers, NOT isClickToFieldActive(): the marking window opens
+        // during the manager preview-generation request, where there is no
+        // show_preview query parameter. PreviewTrait sets this flag for exactly
+        // that window. Anywhere else the placeholder is simply stripped.
+        if ($service->addFieldMarkers
+            && is_array($phs) && array_key_exists('field', $phs) && isset($phs['field_type_idx'])) {
+            $mpAttrs = 'data-magicpreview-field="' . (int)$phs['field'] . '"'
+                . ' data-magicpreview-idx="' . (int)$phs['field_type_idx'] . '"';
+            $service->cbOptedIn[$phs['field'] . ':' . $phs['field_type_idx']] = true;
+        }
+        $modx->event->output(str_replace(
+            [MAGICPREVIEW_CB_PLACEHOLDER_MODX, MAGICPREVIEW_CB_PLACEHOLDER_FENOM],
+            $mpAttrs,
+            $tpl
+        ));
+        break;
+
     case 'ContentBlocks_AfterParse':
         /**
           * @var string $tpl Rendered field output (by reference — set via $modx->event->output())
@@ -313,8 +356,13 @@
         if (array_key_exists('value', $phs) && array_key_exists('items', $phs)) {
             break;
         }
+        // The template placed the attributes itself via the placeholder, so do
+        // not also wrap it — see ContentBlocks_BeforeParse.
+        if (!empty($service->cbOptedIn[$phs['field'] . ':' . $phs['field_type_idx']])) {
+            break;
+        }
         $modx->event->output(
-            '<div style="display:contents"'
+            '<div class="mmmp-cb-field" style="display:contents"'
             . ' data-magicpreview-field="' . (int)$phs['field'] . '"'
             . ' data-magicpreview-idx="' . (int)$phs['field_type_idx'] . '">'
             . $tpl
@@ -322,61 +370,6 @@
         );
         break;
 
-    case 'OnWebPagePrerender':
-        if (!array_key_exists('show_preview', $_GET)) {
-            break;
-        }
-        $output = &$modx->resource->_output;
-        if (strpos($output, "\x02") === false) {
-            break;
-        }
-
-        // Four passes: strip from <head>, strip from <script>/<style> bodies,
-        // strip from HTML opening-tag attribute values, then convert what
-        // remains in body text to click-to-field spans.
-        $output = preg_replace_callback(
-            '/(<head[^>]*>)(.*?)(<\/head>)/si',
-            function ($m) {
-                return $m[1]
-                    . preg_replace("/\x02MMMP:[^\x02]*\x02(.*?)\x03MMMP\x03/s", '$1', $m[2])
-                    . $m[3];
-            },
-            $output
-        );
-
-        // Strip from <script> and <style> bodies in the page body — a marker
-        // inside a JS string literal would otherwise become a <span> tag.
-        $output = preg_replace_callback(
-            '/<(script|style)[^>]*>.*?<\/\1>/si',
-            function ($m) {
-                return preg_replace("/\x02MMMP:[^\x02]*\x02(.*?)\x03MMMP\x03/s", '$1', $m[0]);
-            },
-            $output
-        );
-
-        // Strip from HTML opening tags. The regex handles quoted attribute values
-        // so a literal > inside an attribute (e.g. content="a > b") does not
-        // cause early termination and leave a marker tail in body-text position.
-        $output = preg_replace_callback(
-            '/<[a-zA-Z][^>"\']*(?:"[^"]*"|\'[^\']*\'|[^>])*>/s',
-            function ($m) {
-                return preg_replace("/\x02MMMP:[^\x02]*\x02(.*?)\x03MMMP\x03/s", '$1', $m[0]);
-            },
-            $output
-        );
-
-        $output = preg_replace_callback(
-            "/\x02MMMP:([^\x02]*)\x02(.*?)\x03MMMP\x03/s",
-            function ($m) {
-                return '<span data-magicpreview-field="' . htmlspecialchars($m[1], ENT_QUOTES) . '"'
-                    . ' style="display:contents">'
-                    . $m[2]
-                    . '</span>';
-            },
-            $output
-        );
-        break;
-
 }
 
-return true;
\ No newline at end of file
+return true;
diff --git a/core/components/magicpreview/elements/snippets/mpfield.snippet.php b/core/components/magicpreview/elements/snippets/mpfield.snippet.php
new file mode 100644
index 0000000..7723c5f
--- /dev/null
+++ b/core/components/magicpreview/elements/snippets/mpfield.snippet.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * mpField - returns the click-to-field data attributes for a resource field or TV.
+ *
+ * Place it inside your own element so MagicPreview never has to inject markup:
+ *
+ *   <h1 [[mpField? &name=`pagetitle`]]>[[*pagetitle]]</h1>
+ *
+ * With pdoTools/Fenom any of these work, because pdoTools runs an unknown
+ * modifier name as a snippet of that name:
+ *
+ *   {'pagetitle' | mpField}
+ *   {'mpField' | snippet: ['name' => 'pagetitle']}
+ *   {$_modx->runSnippet('mpField', ['name' => 'pagetitle'])}
+ *
+ * Returns an empty string unless this is a manager preview render with
+ * magicpreview.click_to_field enabled, so it is inert on live pages and on
+ * public share links.
+ *
+ * @var modX $modx
+ * @var array $scriptProperties
+ *
+ * @package magicpreview
+ */
+
+$corePath = $modx->getOption('magicpreview.core_path', null,
+    $modx->getOption('core_path') . 'components/magicpreview/');
+/** @var MagicPreview $service */
+$service = $modx->getService('magicpreview', 'MagicPreview', $corePath . 'model/magicpreview/');
+if (!($service instanceof MagicPreview)) {
+    return '';
+}
+if (!$service->isClickToFieldActive()) {
+    return '';
+}
+
+$name = (string)$modx->getOption('name', $scriptProperties, '');
+if ($name === '') {
+    // The pdoTools auto-modifier path ({'pagetitle'|mpField}) passes the piped
+    // value as 'input' rather than 'name'.
+    $name = (string)$modx->getOption('input', $scriptProperties, '');
+}
+$name = trim($name);
+if ($name === '') {
+    $modx->log(modX::LOG_LEVEL_WARN, '[MagicPreview] mpField called without a field name.');
+    return '';
+}
+
+// Resource fields win over TVs of the same name, matching how modParser itself
+// resolves [[*name]] (see modParser::processTag).
+$identifier = null;
+if ($modx->resource && is_array($modx->resource->_fieldMeta)
+    && array_key_exists($name, $modx->resource->_fieldMeta)) {
+    $identifier = $name;
+} else {
+    $tv = $modx->getObject('modTemplateVar', ['name' => $name]);
+    if ($tv) {
+        $identifier = 'tv' . $tv->get('id');
+    }
+}
+
+if ($identifier === null) {
+    $modx->log(modX::LOG_LEVEL_WARN,
+        '[MagicPreview] mpField: no resource field or TV named "' . $name . '".');
+    return '';
+}
+
+$output = 'data-magicpreview-field="' . htmlspecialchars($identifier, ENT_QUOTES) . '"';
+
+// The click handler defaults idx to 0, so only emit it when asked for.
+$idx = $modx->getOption('idx', $scriptProperties, '');
+if ($idx !== '' && $idx !== null) {
+    $output .= ' data-magicpreview-idx="' . (int)$idx . '"';
+}
+
+return $output;
\ No newline at end of file
diff --git a/core/components/magicpreview/lexicon/da/default.inc.php b/core/components/magicpreview/lexicon/da/default.inc.php
index 3b2f6e1..11a904b 100644
--- a/core/components/magicpreview/lexicon/da/default.inc.php
+++ b/core/components/magicpreview/lexicon/da/default.inc.php
@@ -32,7 +32,7 @@
 $_lang['setting_magicpreview.auto_refresh_interval'] = 'Automatisk opdateringsinterval';
 $_lang['setting_magicpreview.auto_refresh_interval_desc'] = 'Sekunder mellem automatiske forhåndsvisningsopdateringer, mens panelet er åbent. Forhåndsvisningen opdateres kun, når formulardata er ændret. Sæt til 0 for at deaktivere. Standard: 5.';
 $_lang['setting_magicpreview.click_to_field'] = 'Klik til felt';
-$_lang['setting_magicpreview.click_to_field_desc'] = 'Eksperimentel. Når aktiveret, ruller et klik på et felt i forhåndsvisningen ressourceformularen til det pågældende felt og fremhæver det. Fungerer bedst med ContentBlocks, som automatisk omslutter hvert felts output. Der gøres desuden et best-effort-forsøg på at omslultte Core-ressourcefelter (pagetitle, longtitle, description, menutitle, introtext) og TVer via parseren, men dette dækker muligvis ikke alle template-outputkombinationer. Standard: Nej.';
+$_lang['setting_magicpreview.click_to_field_desc'] = 'Eksperimentel. Når aktiveret, ruller et klik på et felt i forhåndsvisningen ressourceformularen til det pågældende felt og fremhæver det. ContentBlocks-felter markeres automatisk. Core-ressourcefelter og TVer skal markeres i din skabelon med snippet\'et mpField, for eksempel: [[mpField? &name=`pagetitle`]] inde i det element, der viser feltet. Ændret i 1.8.0: Core-felter og TVer blev tidligere markeret automatisk, så efter en opgradering forbliver de umarkerede, indtil du tilføjer mpField. Se readme-filen for eksempler med ContentBlocks og Fenom. Standard: Nej.';
 $_lang['setting_magicpreview.template_filter_mode'] = 'Skabelon-filtertilstand';
 $_lang['setting_magicpreview.template_filter_mode_desc'] = 'Begrænser hvor Forhåndsvisnings-knappen vises baseret på skabelon-ID. "None" viser knappen på alle ressourcer (standard). "Block Listed" skjuler knappen på ressourcer, der bruger et skabelon-ID på listen i "Skabelon-filter-ID\'er". "Allow Listed Only" viser kun knappen på ressourcer med et skabelon-ID på listen (en tom liste skjuler den overalt).';
 $_lang['setting_magicpreview.template_filter_ids'] = 'Skabelon-filter-ID\'er';
diff --git a/core/components/magicpreview/lexicon/de/default.inc.php b/core/components/magicpreview/lexicon/de/default.inc.php
index 13a0a29..297a595 100644
--- a/core/components/magicpreview/lexicon/de/default.inc.php
+++ b/core/components/magicpreview/lexicon/de/default.inc.php
@@ -31,7 +31,7 @@
 $_lang['setting_magicpreview.auto_refresh_interval'] = 'Automatisches Aktualisierungsintervall';
 $_lang['setting_magicpreview.auto_refresh_interval_desc'] = 'Sekunden zwischen automatischen Vorschau-Aktualisierungen, während das Panel geöffnet ist. Die Vorschau wird nur aktualisiert, wenn sich Formulardaten geändert haben. Auf 0 setzen zum Deaktivieren. Standard: 5.';
 $_lang['setting_magicpreview.click_to_field'] = 'Klick zum Feld';
-$_lang['setting_magicpreview.click_to_field_desc'] = 'Experimentell. Wenn aktiviert, scrollt ein Klick auf ein Feld in der Vorschau das Ressourcenformular zu diesem Feld und hebt es hervor. Funktioniert am besten mit ContentBlocks, das die Ausgabe jedes Feldes automatisch umschließt. Es wird außerdem ein Best-Effort-Versuch unternommen, Core-Ressourcenfelder (pagetitle, longtitle, description, menutitle, introtext) und TVs über den Parser zu umschließen, was jedoch nicht alle Template-Ausgabekombinationen abdecken kann. Standard: Nein.';
+$_lang['setting_magicpreview.click_to_field_desc'] = 'Experimentell. Wenn aktiviert, scrollt ein Klick auf ein Feld in der Vorschau das Ressourcenformular zu diesem Feld und hebt es hervor. ContentBlocks-Felder werden automatisch markiert. Core-Ressourcenfelder und TVs müssen im Template mit dem Snippet mpField markiert werden, zum Beispiel: [[mpField? &name=`pagetitle`]] innerhalb des Elements, das das Feld ausgibt. Geändert in 1.8.0: Core-Felder und TVs wurden zuvor automatisch markiert, nach einem Upgrade bleiben sie daher unmarkiert, bis Sie mpField hinzufügen. Beispiele für ContentBlocks und Fenom finden Sie in der Readme-Datei. Standard: Nein.';
 $_lang['setting_magicpreview.template_filter_mode'] = 'Vorlagen-Filtermodus';
 $_lang['setting_magicpreview.template_filter_mode_desc'] = 'Begrenzt, wo der Vorschau-Button erscheint, basierend auf der Vorlagen-ID. "None" zeigt den Button für alle Ressourcen (Standard). "Block Listed" blendet den Button für Ressourcen mit einer in "Vorlagen-Filter-IDs" aufgelisteten Vorlagen-ID aus. "Allow Listed Only" zeigt den Button nur für Ressourcen mit aufgelisteter Vorlagen-ID (leere Liste blendet ihn überall aus).';
 $_lang['setting_magicpreview.template_filter_ids'] = 'Vorlagen-Filter-IDs';
diff --git a/core/components/magicpreview/lexicon/en/default.inc.php b/core/components/magicpreview/lexicon/en/default.inc.php
index fc45617..8184164 100644
--- a/core/components/magicpreview/lexicon/en/default.inc.php
+++ b/core/components/magicpreview/lexicon/en/default.inc.php
@@ -32,7 +32,7 @@
 $_lang['setting_magicpreview.auto_refresh_interval'] = 'Auto Refresh Interval';
 $_lang['setting_magicpreview.auto_refresh_interval_desc'] = 'Seconds between automatic preview refreshes while the panel is open. The preview only refreshes when form data has changed. Set to 0 to disable. Default: 5.';
 $_lang['setting_magicpreview.click_to_field'] = 'Click to Field';
-$_lang['setting_magicpreview.click_to_field_desc'] = 'Experimental. When enabled, clicking a field in the preview scrolls the resource form to that field and highlights it. Works best with ContentBlocks, which wraps each field\'s output automatically. A best-effort attempt is also made to wrap core resource fields (pagetitle, longtitle, description, menutitle, introtext) and TVs via the parser, though this may not cover all template output combinations. Default: No.';
+$_lang['setting_magicpreview.click_to_field_desc'] = 'Experimental. When enabled, clicking a field in the preview scrolls the resource form to that field and highlights it. ContentBlocks fields are marked automatically. Core resource fields and TVs must be marked in your template with the mpField snippet, for example: [[mpField? &name=`pagetitle`]] inside the element that renders the field. Changed in 1.8.0: core fields and TVs used to be marked automatically, so after upgrading they stay unmarked until you add mpField. See the readme for ContentBlocks and Fenom examples. Default: No.';
 $_lang['setting_magicpreview.template_filter_mode'] = 'Template Filter Mode';
 $_lang['setting_magicpreview.template_filter_mode_desc'] = 'Restrict where the Preview button appears based on template ID. "None" shows the button on every resource (default). "Block Listed" hides the button on resources using a template ID listed in Template Filter IDs. "Allow Listed Only" shows the button only on resources using a listed template ID (an empty list will hide it everywhere).';
 $_lang['setting_magicpreview.template_filter_ids'] = 'Template Filter IDs';
diff --git a/core/components/magicpreview/model/magicpreview/MagicPreviewCoreParser.class.php b/core/components/magicpreview/model/magicpreview/MagicPreviewCoreParser.class.php
deleted file mode 100644
index 6ca74db..0000000
--- a/core/components/magicpreview/model/magicpreview/MagicPreviewCoreParser.class.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Frontend parser substitution used during preview page rendering.
- *
- * Overrides processTag() to intercept [[*fieldname]] resource field tags for
- * known wrappable core fields and TVs. Instead of returning plain text, it wraps
- * the rendered value in STX/ETX control-character markers:
- *
- *   \x02MMMP:pagetitle\x02rendered value\x03MMMP\x03
- *   \x02MMMP:tv42\x02rendered value\x03MMMP\x03
- *
- * These markers are safe to embed anywhere in HTML because control characters
- * (U+0002 / U+0003) never appear in valid HTML content. The OnWebPagePrerender
- * plugin handler then resolves them: markers inside <head>, <script>, <style>,
- * or HTML attribute contexts are stripped (leaving just the value); markers in
- * body content become <span data-magicpreview-field="pagetitle" style="display:contents">
- * elements that the frontend click handler can target.
- *
- * TV tags use "tv{id}" as the field identifier (e.g. "tv42") so the manager-side
- * scrollToField() can locate the input via [name="tv42"].
- *
- * Installed on $modx->parser during OnLoadWebDocument (preview requests only).
- * Restoration is not needed — the request ends after the page is rendered.
- */
-
-require_once __DIR__ . '/MagicPreviewCoreParserTrait.php';
-
-// MODX 3 branch — class defined only when \MODX\Revolution\modParser is available.
-if (class_exists('\MODX\Revolution\modParser', false)) {
-    if (!class_exists('MagicPreviewCoreParser', false)) {
-        class MagicPreviewCoreParser extends \MODX\Revolution\modParser
-        {
-            use MagicPreviewCoreParserTrait;
-        }
-    }
-} elseif (!class_exists('MagicPreviewCoreParser', false)) {
-    // MODX 2 branch.
-    class MagicPreviewCoreParser extends modParser
-    {
-        use MagicPreviewCoreParserTrait;
-    }
-}
diff --git a/core/components/magicpreview/model/magicpreview/MagicPreviewCoreParserTrait.php b/core/components/magicpreview/model/magicpreview/MagicPreviewCoreParserTrait.php
deleted file mode 100644
index 32c2664..0000000
--- a/core/components/magicpreview/model/magicpreview/MagicPreviewCoreParserTrait.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-trait MagicPreviewCoreParserTrait
-{
-    /** @var string[] Core resource fields wrapped using their own name as the field identifier. */
-    protected $wrappableFields = [
-        'pagetitle', 'longtitle', 'description', 'menutitle', 'introtext',
-    ];
-
-    /** @var array<string, string|null> Cache of TV name → "tv{id}" (or null if not a TV). */
-    protected $tvIdCache = [];
-
-    /**
-     * @param array|string $tag
-     * @param bool $processUncacheable
-     */
-    public function processTag($tag, $processUncacheable = true)
-    {
-        $innerTag = is_array($tag) ? (isset($tag[1]) ? (string)$tag[1] : '') : (string)$tag;
-
-        $tagName = trim($innerTag);
-        $tokenOffset = 0;
-        if (substr($tagName, 0, 1) === '!') {
-            $tokenOffset = 1;
-        }
-        $token = substr($tagName, $tokenOffset, 1);
-
-        if ($token !== '*') {
-            return parent::processTag($tag, $processUncacheable);
-        }
-
-        $fieldName = substr($tagName, $tokenOffset + 1);
-        if (substr($fieldName, 0, 1) === '#') {
-            $fieldName = substr($fieldName, 1);
-        }
-        $fieldName = explode('?', $fieldName)[0];
-        $fieldName = explode(':', $fieldName)[0];
-        $fieldName = trim($fieldName);
-
-        if (in_array($fieldName, $this->wrappableFields, true)) {
-            $markerField = $fieldName;
-        } else {
-            $markerField = $this->getTvFieldId($fieldName);
-            if ($markerField === null) {
-                return parent::processTag($tag, $processUncacheable);
-            }
-        }
-
-        $output = parent::processTag($tag, $processUncacheable);
-
-        // Only wrap if the parent returned a plain processed string value.
-        // Skip if the output is empty, unresolved (starts with [[), or already
-        // contains a marker from a nested tag (e.g. [[*longtitle:ne=`[[*pagetitle]]`]]
-        // when longtitle is empty — wrapping the inner marker again produces
-        // double-nested markers that OnWebPagePrerender's regex cannot fully strip).
-        if (!is_string($output) || $output === '' || substr($output, 0, 2) === '[[' || strpos($output, "\x02") !== false) {
-            return $output;
-        }
-
-        return "\x02MMMP:{$markerField}\x02{$output}\x03MMMP\x03";
-    }
-
-    /**
-     * Returns "tv{id}" for a TV identified by name, or null if not a TV.
-     * Results are cached on the instance to avoid repeated DB queries.
-     *
-     * @param string $name
-     * @return string|null
-     */
-    private function getTvFieldId($name)
-    {
-        if (!array_key_exists($name, $this->tvIdCache)) {
-            $tv = $this->modx->getObject('modTemplateVar', ['name' => $name]);
-            $this->tvIdCache[$name] = $tv ? 'tv' . $tv->get('id') : null;
-        }
-        return $this->tvIdCache[$name];
-    }
-}
diff --git a/core/components/magicpreview/model/magicpreview/magicpreview.class.php b/core/components/magicpreview/model/magicpreview/magicpreview.class.php
index 9a1715f..19affbd 100644
--- a/core/components/magicpreview/model/magicpreview/magicpreview.class.php
+++ b/core/components/magicpreview/model/magicpreview/magicpreview.class.php
@@ -22,7 +22,17 @@ class MagicPreview
      */
     public bool $addFieldMarkers = false;
 
-    const VERSION = '1.7.1-pl';
+    /**
+     * ContentBlocks field instances whose template placed the click-to-field
+     * attributes itself, keyed "<fieldId>:<fieldTypeIdx>". Written by the
+     * ContentBlocks_BeforeParse handler and read by ContentBlocks_AfterParse so
+     * an opted-in field does not also receive the automatic wrapper.
+     *
+     * @var array<string, bool>
+     */
+    public array $cbOptedIn = [];
+
+    const VERSION = '1.8.0-pl';
 
     private ?MagicPreviewDrafts $drafts = null;
     private ?MagicPreviewShares $shares = null;
@@ -88,6 +98,39 @@ public function shares(): MagicPreviewShares
         return $this->shares;
     }
 
+    /**
+     * True only when click-to-field markup should be emitted during a front-end
+     * preview render: the setting is on, this request is a preview, and the
+     * visitor holds a manager session.
+     *
+     * Conditions 2 and 3 are what keep attributes off live pages and off public
+     * share links - assets/components/magicpreview/share.php renders without
+     * show_preview and without a manager session.
+     *
+     * NOT usable in the manager processor request (PreviewTrait) or in the
+     * ContentBlocks parse events, where neither show_preview nor a web render
+     * exists; those paths test the raw magicpreview.click_to_field setting and
+     * the $addFieldMarkers flag respectively.
+     *
+     * @return bool
+     */
+    public function isClickToFieldActive(): bool
+    {
+        if (!$this->modx->getOption('magicpreview.click_to_field', null, false)) {
+            return false;
+        }
+        if (!array_key_exists('show_preview', $_GET)) {
+            return false;
+        }
+        if (!$this->modx->user) {
+            return false;
+        }
+        if (!$this->modx->user->hasSessionContext('mgr')) {
+            return false;
+        }
+        return true;
+    }
+
     /**
      * The single definition of expiry for drafts and share links: a row is
      * expired iff it has an expiry (expires_at > 0) that has passed.
diff --git a/core/components/magicpreview/processors/resource/PreviewTrait.php b/core/components/magicpreview/processors/resource/PreviewTrait.php
index 0b00754..a4c7897 100644
--- a/core/components/magicpreview/processors/resource/PreviewTrait.php
+++ b/core/components/magicpreview/processors/resource/PreviewTrait.php
@@ -18,21 +18,34 @@ public function fireBeforeSaveEvent()
     {
         $service = $this->getMagicPreviewService();
 
-        // Bypasses parseProperties() collapsing arrays-with-'value' to strings —
-        // ContentBlocks_AfterParse passes $phs as a plain associative array that may
-        // have a 'value' key, which the default parser would otherwise mangle.
-        // ContentBlocks' loadParser()/restoreParser() correctly preserves this instance.
-        $this->modx->getParser();
-        if (!class_exists('MagicPreviewContentBlocksParser', false)) {
-            require_once __DIR__ . '/../../model/magicpreview/MagicPreviewContentBlocksParser.class.php';
-        }
-        $savedParser = $this->modx->parser;
-        $this->modx->parser = new MagicPreviewContentBlocksParser($this->modx);
+        // The ContentBlocks parser substitution exists solely so the
+        // ContentBlocks_BeforeParse / _AfterParse handlers receive $phs intact —
+        // MODX's parseProperties() would otherwise collapse an array param that
+        // has a 'value' key down to that string. Both handlers do nothing unless
+        // click-to-field is on, and there is nothing to parse without CB content,
+        // so swap only when both hold rather than replacing the site's parser on
+        // every preview.
+        //
+        // This gate is the raw setting, NOT isClickToFieldActive(): that method
+        // requires show_preview and a web render, which describe the front-end
+        // preview request, not this manager processor request.
+        $wantsMarkers = (bool)$this->modx->getOption('magicpreview.click_to_field', null, false);
+        $hasCbContent = !empty($this->object->get('contentblocks'));
+        $swapParser = ($wantsMarkers && $hasCbContent);
+
+        $savedParser = null;
         // Clear the element cache so every ContentBlocks_AfterParse execution runs fresh
         // rather than returning a cached (empty) event output.
         $savedElementCache = $this->modx->elementCache;
         $this->modx->elementCache = [];
-        if ($this->modx->getOption('magicpreview.click_to_field', null, false)) {
+        if ($swapParser) {
+            // ContentBlocks' loadParser()/restoreParser() correctly preserves this instance.
+            $this->modx->getParser();
+            if (!class_exists('MagicPreviewContentBlocksParser', false)) {
+                require_once __DIR__ . '/../../model/magicpreview/MagicPreviewContentBlocksParser.class.php';
+            }
+            $savedParser = $this->modx->parser;
+            $this->modx->parser = new MagicPreviewContentBlocksParser($this->modx);
             $service->addFieldMarkers = true;
         }
         try {
@@ -42,8 +55,11 @@ public function fireBeforeSaveEvent()
             ]);
         } finally {
             $service->addFieldMarkers = false;
+            $service->cbOptedIn = [];
             $this->modx->elementCache = $savedElementCache;
-            $this->modx->parser = $savedParser;
+            if ($savedParser !== null) {
+                $this->modx->parser = $savedParser;
+            }
         }
 
         $this->failedSuccessfully = true;