diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ddc05ab..c4526355 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+This is a hack so the CHANGELOG is messed up. 
+Generated by build_release.sh
 <!-- markdownlint-disable MD024 -->
 # OS2Forms Change Log
 
@@ -11,6 +13,9 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [Unreleased]
 
+- [PR-325](https://github.com/OS2Forms/os2forms/pull/325)
+  Added NemID first name, middle name and last name webform elements.
+
 ## [5.1.0] 2026-06-03
 
 - [PR-326](https://github.com/OS2Forms/os2forms/pull/326)
diff --git a/build_release.sh b/build_release.sh
new file mode 100755
index 00000000..c1f358a2
--- /dev/null
+++ b/build_release.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+# selvbetjening.aarhuskommune.dk branch
+# Setup upstream with OS2Forms CORE
+git remote add upstream https://github.com/OS2Forms/os2forms.git
+git fetch
+git reset --hard 5.1.0
+git merge --no-ff origin/feature/maps-element-display
+git checkout --theirs CHANGELOG.md
+git add CHANGELOG.md
+git commit -m "Merge remote-tracking branch 'origin/feature/maps-element-display' into selvbetjening.aarhuskommune.dk"
+git merge --no-ff origin/fix/336-avoid-inheriting-data-on-page-transition
+git checkout --theirs CHANGELOG.md
+git add CHANGELOG.md
+git commit -m "Merge remote-tracking branch 'origin/fix/336-avoid-inheriting-data-on-page-transition' into selvbetjening.aarhuskommune.dk"
+git merge --no-ff origin/feature/add-first-middle-and-last-name-nemid-elements
+git checkout --theirs CHANGELOG.md
+git add CHANGELOG.md
+git commit -m "Merge remote-tracking branch 'origin/feature/add-first-middle-and-last-name-nemid-elements' into selvbetjening.aarhuskommune.dk"
+
+docker run --rm --volume .:/app itkdev/php8.4-fpm:latest sed --in-place '1i This is a hack so the CHANGELOG is messed up. \nGenerated by build_release.sh' CHANGELOG.md
+git add CHANGELOG.md
+git commit -m "Updated CHANGELOG"
diff --git a/composer.json b/composer.json
index ba5f18b2..2a8b4388 100644
--- a/composer.json
+++ b/composer.json
@@ -56,7 +56,7 @@
         "itk-dev/serviceplatformen": "^1.7.1",
         "mglaman/composer-drupal-lenient": "^1.0",
         "os2web/os2web_audit": "^1.0",
-        "os2web/os2web_datalookup": "^3.0",
+        "os2web/os2web_datalookup": "dev-selvbetjening.aarhuskommune.dk as 3.4.0",
         "os2web/os2web_key": "^1.0",
         "os2web/os2web_nemlogin": "^1.0",
         "os2web/os2web_simplesaml": "dev-master",
@@ -76,16 +76,23 @@
         "phpunit/phpunit": "^9.5",
         "wsdltophp/packagegenerator": "^4.0"
     },
-    "repositories": {
-        "drupal": {
+    "repositories": [
+        {
+            "name": "os2web/os2web_datalookup",
+            "type": "vcs",
+            "url": "https://github.com/itk-dev/os2web_datalookup"
+        },
+        {
+            "name": "drupal",
             "type": "composer",
             "url": "https://packages.drupal.org/8"
         },
-        "assets": {
+        {
+            "name": "assets",
             "type": "composer",
             "url": "https://asset-packagist.org"
         }
-    },
+    ],
     "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
@@ -100,6 +107,11 @@
             "vaimo/composer-patches": true,
             "zaporylie/composer-drupal-optimizations": true
         },
+        "policy": {
+            "advisories": {
+                "block": false
+            }
+        },
         "sort-packages": true
     },
     "extra": {
diff --git a/modules/os2forms_forloeb/src/Plugin/EngineTasks/MaestroWebformInheritTask.php b/modules/os2forms_forloeb/src/Plugin/EngineTasks/MaestroWebformInheritTask.php
index 9544cee5..dd25f1cd 100644
--- a/modules/os2forms_forloeb/src/Plugin/EngineTasks/MaestroWebformInheritTask.php
+++ b/modules/os2forms_forloeb/src/Plugin/EngineTasks/MaestroWebformInheritTask.php
@@ -144,6 +144,13 @@ public function prepareTaskForSave(array &$form, FormStateInterface $form_state,
    * Implements hook_webform_submission_form_alter().
    */
   public static function webformSubmissionFormAlter(array &$form, FormStateInterface $formState, string $formId) {
+    // Only inherit values on the initial form load. This skip condition is the
+    // complement of webform's own prepopulate guard.
+    // @see \Drupal\webform\WebformSubmissionForm::buildForm()
+    if ($formState->isRebuilding() && !$formState->get('is_ajax_restart')) {
+      return;
+    }
+
     // @todo Clean up and align with MaestroHelper::maestroZeroUserNotification().
     if ($queueID = self::getQueueIdFromRequest()) {
       $templateTask = MaestroEngine::getTemplateTaskByQueueID($queueID);
diff --git a/modules/os2forms_nemid/src/Element/NemidFirstName.php b/modules/os2forms_nemid/src/Element/NemidFirstName.php
new file mode 100644
index 00000000..22be1147
--- /dev/null
+++ b/modules/os2forms_nemid/src/Element/NemidFirstName.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Drupal\os2forms_nemid\Element;
+
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Provides a 'os2forms_nemid_first_name'.
+ *
+ * @FormElement("os2forms_nemid_first_name")
+ *
+ * @see \Drupal\Core\Render\Element\FormElement
+ * @see https://api.drupal.org/api/drupal/core%21lib%21Drupal%21Core%21Render%21Element%21FormElement.php/class/FormElement
+ * @see \Drupal\Core\Render\Element\RenderElement
+ * @see https://api.drupal.org/api/drupal/namespace/Drupal%21Core%21Render%21Element
+ * @see \Drupal\os2forms_nemid\Element\NemidFirstName
+ */
+class NemidFirstName extends NemidElementBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getInfo() {
+    $class = get_class($this);
+    return parent::getInfo() + [
+      '#process' => [
+        [$class, 'processNemidFirstName'],
+        [$class, 'processAjaxForm'],
+      ],
+      '#element_validate' => [
+        [$class, 'validateNemidFirstName'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderNemidFirstName'],
+      ],
+      '#theme' => 'input__os2forms_nemid_first_name',
+    ];
+  }
+
+  /**
+   * Processes a 'os2forms_nemid_first_name' element.
+   */
+  public static function processNemidFirstName(&$element, FormStateInterface $form_state, &$complete_form) {
+    // Here you can add and manipulate your element's properties and callbacks.
+    return $element;
+  }
+
+  /**
+   * Webform element validation handler for #type 'os2forms_nemid_first_name'.
+   */
+  public static function validateNemidFirstName(&$element, FormStateInterface $form_state, &$complete_form) {
+    // Here you can add custom validation logic.
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function preRenderNemidFirstName(array $element) {
+    $element = parent::prerenderNemidElementBase($element);
+    static::setAttributes($element, ['form-text', 'os2forms-nemid-first-name']);
+    return $element;
+  }
+
+}
diff --git a/modules/os2forms_nemid/src/Element/NemidLastName.php b/modules/os2forms_nemid/src/Element/NemidLastName.php
new file mode 100644
index 00000000..251b1144
--- /dev/null
+++ b/modules/os2forms_nemid/src/Element/NemidLastName.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Drupal\os2forms_nemid\Element;
+
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Provides a 'os2forms_nemid_last_name'.
+ *
+ * @FormElement("os2forms_nemid_last_name")
+ *
+ * @see \Drupal\Core\Render\Element\FormElement
+ * @see https://api.drupal.org/api/drupal/core%21lib%21Drupal%21Core%21Render%21Element%21FormElement.php/class/FormElement
+ * @see \Drupal\Core\Render\Element\RenderElement
+ * @see https://api.drupal.org/api/drupal/namespace/Drupal%21Core%21Render%21Element
+ * @see \Drupal\os2forms_nemid\Element\NemidLastName
+ */
+class NemidLastName extends NemidElementBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getInfo() {
+    $class = get_class($this);
+    return parent::getInfo() + [
+      '#process' => [
+        [$class, 'processNemidLastName'],
+        [$class, 'processAjaxForm'],
+      ],
+      '#element_validate' => [
+        [$class, 'validateNemidLastName'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderNemidLastName'],
+      ],
+      '#theme' => 'input__os2forms_nemid_last_name',
+    ];
+  }
+
+  /**
+   * Processes a 'os2forms_nemid_last_name' element.
+   */
+  public static function processNemidLastName(&$element, FormStateInterface $form_state, &$complete_form) {
+    // Here you can add and manipulate your element's properties and callbacks.
+    return $element;
+  }
+
+  /**
+   * Webform element validation handler for #type 'os2forms_nemid_last_name'.
+   */
+  public static function validateNemidLastName(&$element, FormStateInterface $form_state, &$complete_form) {
+    // Here you can add custom validation logic.
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function preRenderNemidLastName(array $element) {
+    $element = parent::prerenderNemidElementBase($element);
+    static::setAttributes($element, ['form-text', 'os2forms-nemid-last-name']);
+    return $element;
+  }
+
+}
diff --git a/modules/os2forms_nemid/src/Element/NemidMiddleName.php b/modules/os2forms_nemid/src/Element/NemidMiddleName.php
new file mode 100644
index 00000000..48c038ec
--- /dev/null
+++ b/modules/os2forms_nemid/src/Element/NemidMiddleName.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Drupal\os2forms_nemid\Element;
+
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Provides a 'os2forms_nemid_middle_name'.
+ *
+ * @FormElement("os2forms_nemid_middle_name")
+ *
+ * @see \Drupal\Core\Render\Element\FormElement
+ * @see https://api.drupal.org/api/drupal/core%21lib%21Drupal%21Core%21Render%21Element%21FormElement.php/class/FormElement
+ * @see \Drupal\Core\Render\Element\RenderElement
+ * @see https://api.drupal.org/api/drupal/namespace/Drupal%21Core%21Render%21Element
+ * @see \Drupal\os2forms_nemid\Element\NemidMiddleName
+ */
+class NemidMiddleName extends NemidElementBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getInfo() {
+    $class = get_class($this);
+    return parent::getInfo() + [
+      '#process' => [
+        [$class, 'processNemidMiddleName'],
+        [$class, 'processAjaxForm'],
+      ],
+      '#element_validate' => [
+        [$class, 'validateNemidMiddleName'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderNemidMiddleName'],
+      ],
+      '#theme' => 'input__os2forms_nemid_middle_name',
+    ];
+  }
+
+  /**
+   * Processes a 'os2forms_nemid_middle_name' element.
+   */
+  public static function processNemidMiddleName(&$element, FormStateInterface $form_state, &$complete_form) {
+    // Here you can add and manipulate your element's properties and callbacks.
+    return $element;
+  }
+
+  /**
+   * Webform element validation handler for #type 'os2forms_nemid_middle_name'.
+   */
+  public static function validateNemidMiddleName(&$element, FormStateInterface $form_state, &$complete_form) {
+    // Here you can add custom validation logic.
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function preRenderNemidMiddleName(array $element) {
+    $element = parent::prerenderNemidElementBase($element);
+    static::setAttributes($element, ['form-text', 'os2forms-nemid-middle-name']);
+    return $element;
+  }
+
+}
diff --git a/modules/os2forms_nemid/src/Plugin/WebformElement/NemidFirstName.php b/modules/os2forms_nemid/src/Plugin/WebformElement/NemidFirstName.php
new file mode 100644
index 00000000..1f0b2468
--- /dev/null
+++ b/modules/os2forms_nemid/src/Plugin/WebformElement/NemidFirstName.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\os2forms_nemid\Plugin\WebformElement;
+
+use Drupal\os2web_datalookup\LookupResult\CprLookupResult;
+
+/**
+ * Provides a 'os2forms_nemid_first_name' element.
+ *
+ * @WebformElement(
+ *   id = "os2forms_nemid_first_name",
+ *   label = @Translation("NemID First name"),
+ *   description = @Translation("Provides a NemID First name element."),
+ *   category = @Translation("NemID"),
+ * )
+ *
+ * @see \Drupal\os2forms_nemid\Plugin\NemidElementBase
+ * @see \Drupal\os2forms_nemid\Element\NemidFirstName
+ */
+class NemidFirstName extends ServiceplatformenCprElementBase implements NemidElementPersonalInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getPrepopulateFieldFieldKey(array &$element) {
+    return CprLookupResult::FIRST_NAME;
+  }
+
+}
diff --git a/modules/os2forms_nemid/src/Plugin/WebformElement/NemidLastName.php b/modules/os2forms_nemid/src/Plugin/WebformElement/NemidLastName.php
new file mode 100644
index 00000000..9c2bccae
--- /dev/null
+++ b/modules/os2forms_nemid/src/Plugin/WebformElement/NemidLastName.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\os2forms_nemid\Plugin\WebformElement;
+
+use Drupal\os2web_datalookup\LookupResult\CprLookupResult;
+
+/**
+ * Provides a 'os2forms_nemid_last_name' element.
+ *
+ * @WebformElement(
+ *   id = "os2forms_nemid_last_name",
+ *   label = @Translation("NemID Last name"),
+ *   description = @Translation("Provides a NemID Last name element."),
+ *   category = @Translation("NemID"),
+ * )
+ *
+ * @see \Drupal\os2forms_nemid\Plugin\NemidElementBase
+ * @see \Drupal\os2forms_nemid\Element\NemidLastName
+ */
+class NemidLastName extends ServiceplatformenCprElementBase implements NemidElementPersonalInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getPrepopulateFieldFieldKey(array &$element) {
+    return CprLookupResult::LAST_NAME;
+  }
+
+}
diff --git a/modules/os2forms_nemid/src/Plugin/WebformElement/NemidMiddleName.php b/modules/os2forms_nemid/src/Plugin/WebformElement/NemidMiddleName.php
new file mode 100644
index 00000000..93a576e1
--- /dev/null
+++ b/modules/os2forms_nemid/src/Plugin/WebformElement/NemidMiddleName.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\os2forms_nemid\Plugin\WebformElement;
+
+use Drupal\os2web_datalookup\LookupResult\CprLookupResult;
+
+/**
+ * Provides a 'os2forms_nemid_middle_name' element.
+ *
+ * @WebformElement(
+ *   id = "os2forms_nemid_middle_name",
+ *   label = @Translation("NemID Middle name"),
+ *   description = @Translation("Provides a NemID Middle name element."),
+ *   category = @Translation("NemID"),
+ * )
+ *
+ * @see \Drupal\os2forms_nemid\Plugin\NemidElementBase
+ * @see \Drupal\os2forms_nemid\Element\NemidMiddleName
+ */
+class NemidMiddleName extends ServiceplatformenCprElementBase implements NemidElementPersonalInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getPrepopulateFieldFieldKey(array &$element) {
+    return CprLookupResult::MIDDLE_NAME;
+  }
+
+}
diff --git a/modules/os2forms_webform_maps/README.md b/modules/os2forms_webform_maps/README.md
index c36b901e..d93aa5d4 100644
--- a/modules/os2forms_webform_maps/README.md
+++ b/modules/os2forms_webform_maps/README.md
@@ -14,3 +14,58 @@ the map. The data can be exported to PDF.
 ## Installation
 
 The module can be installed using the standard Drupal installation procedure.
+
+## Fetching GeoJSON using the API
+
+Assume that we have a webform with ID `my_webform` and the webform has a Map element with ID `my_map`. We can then fetch
+the data for a submission with UUID `c34d01c5-7bd9-4b15-8b01-5787959453c0` on the webform with a HTTP `GET` request (cf.
+[OS2Forms REST API](https://github.com/OS2Forms/os2forms_rest_api/blob/main/README.md)):
+
+``` shell name=api-fetch-submission-data
+curl --silent --location --header 'api-key: my-api-key' http://127.0.0.1:8000/webform_rest/my_webform/submission/c34d01c5-7bd9-4b15-8b01-5787959453c0
+# {"entity":{"serial":[{"value":1}],"sid":[{"value":2}],"uuid":[{"value":"c34d01c5-7bd9-4b15-8b01-5787959453c0"}],…```
+```
+
+The result, however, contains a lot of data and we need a little more work the extract just the GeoJSON data.
+
+Using [`jq`](https://jqlang.org/) (or similar tools), we can drill down into the full submission data to extract just
+the GeoJSON data from the Map element (JSON decoding twice along the way):
+
+``` shell name=api-extract-map-element-data
+curl --silent --location --header 'api-key: my-api-key' http://127.0.0.1:8000/webform_rest/my_webform/submission/c34d01c5-7bd9-4b15-8b01-5787959453c0 | jq '.data.my_map | fromjson | .geojson | fromjson'
+```
+
+The final result will be something like
+
+``` json
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "properties": {},
+      "geometry": {
+        "type": "LineString",
+        "coordinates": [
+          [
+            10.193674,
+            56.158929
+          ],
+          [
+            10.241758,
+            56.155296
+          ],
+          [
+            10.242788,
+            56.130048
+          ],
+          [
+            10.189209,
+            56.129283
+          ]
+        ]
+      }
+    }
+  ]
+}
+```
diff --git a/modules/os2forms_webform_maps/os2forms_webform_maps.module b/modules/os2forms_webform_maps/os2forms_webform_maps.module
index af545a5d..17d33aab 100644
--- a/modules/os2forms_webform_maps/os2forms_webform_maps.module
+++ b/modules/os2forms_webform_maps/os2forms_webform_maps.module
@@ -5,22 +5,6 @@
  * Module file for os2forms_webform_maps.
  */
 
-/**
- * Implements hook_theme().
- */
-function os2forms_webform_maps_theme() {
-  return [
-    'webform_element_base_html__webform_map_field' => [
-      'variables' => [
-        'element' => [],
-        'value' => NULL,
-        'webform_submission' => NULL,
-        'options' => [],
-      ],
-    ],
-  ];
-}
-
 /**
  * Implements hook_locale_translation_projects_alter().
  */
@@ -29,31 +13,3 @@ function os2forms_webform_maps_locale_translation_projects_alter(&$projects) {
   $path = $module_handler->getModule('os2forms_webform_maps')->getPath();
   $projects['os2forms_webform_maps']['info']['interface translation server pattern'] = $path . '/translations/%language.po';
 }
-
-/**
- * Implements hook_preprocess_webform_element_base_html__webform_map_field().
- */
-function os2forms_webform_maps_preprocess_webform_element_base_html__webform_map_field(array &$variables) {
-  // Decode the plain text value once.
-  $decoded_value = json_decode($variables['value']['#plain_text']);
-
-  // Use the decoded geojson property.
-  $variables['value']['#plain_text'] = $decoded_value->geojson;
-
-  // Load the webform element base HTML template.
-  \Drupal::moduleHandler()->loadInclude('webform', 'inc', 'includes/webform.theme.template');
-  template_preprocess_webform_element_base_html($variables);
-
-  // Generate a unique ID for the map image.
-  $map_image_id = 'map-image-' . $variables['element']['#webform_key'];
-
-  $variables['map_image'] = [
-    '#type' => 'html_tag',
-    '#tag' => 'img',
-    '#attributes' => [
-      'class' => ['handler-help-message'],
-      'id' => [$map_image_id],
-      'src' => $decoded_value->image ?? '',
-    ],
-  ];
-}
diff --git a/modules/os2forms_webform_maps/src/Plugin/WebformElement/WebformLeafletMapField.php b/modules/os2forms_webform_maps/src/Plugin/WebformElement/WebformLeafletMapField.php
index 3b6aa405..00327dcf 100644
--- a/modules/os2forms_webform_maps/src/Plugin/WebformElement/WebformLeafletMapField.php
+++ b/modules/os2forms_webform_maps/src/Plugin/WebformElement/WebformLeafletMapField.php
@@ -5,6 +5,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\leaflet\LeafletSettingsElementsTrait;
 use Drupal\webform\Plugin\WebformElementBase;
+use Drupal\webform\WebformSubmissionInterface;
 
 /**
  * Provides a 'webform_map_field' element.
@@ -70,6 +71,9 @@ public function defineDefaultProperties(): array {
       'circle_color' => '#3388FF',
       'rectangle_color' => '#3388FF',
 
+      // Display settings.
+      'display_image_on' => ['email', 'html', 'pdf'],
+      'display_geojson_on' => ['text', 'html'],
     ] + parent::defineDefaultProperties();
   }
 
@@ -344,7 +348,120 @@ public function form(array $form, FormStateInterface $form_state) {
       ],
     ];
 
+    $form['display_settings'] = [
+      '#type' => 'fieldset',
+      '#title' => $this->t('Display settings'),
+    ];
+    $form['display_settings']['display_settings_container'] = [
+      'display_image_on' => [
+        '#type' => 'checkboxes',
+        '#title' => $this->t('Display image on'),
+        '#options' => [
+          'email' => $this->t('Email'),
+          'html' => $this->t('HTML'),
+          'pdf' => $this->t('PDF'),
+        ],
+      ],
+
+      'display_geojson_on' => [
+        '#type' => 'checkboxes',
+        '#title' => $this->t('Display GeoJSON on'),
+        '#options' => [
+          'email' => $this->t('Email'),
+          'html' => $this->t('HTML'),
+          'pdf' => $this->t('PDF'),
+          'text' => $this->t('Text'),
+        ],
+      ],
+    ];
+
     return $form;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function formatHtmlItem(array $element, WebformSubmissionInterface $webform_submission, array $options = []): array {
+    $value = $this->getMapValue($element, $webform_submission, $options);
+
+    $imageId = 'map-image-' . $this->getKey($element);
+
+    $build = [];
+
+    $viewMode = $options['view_mode'] ?? 'results';
+    if ('table' === $viewMode) {
+      $viewMode = 'html';
+    }
+    elseif ($options['email'] ?? FALSE) {
+      $viewMode = 'email';
+    }
+    elseif ($options['pdf'] ?? FALSE) {
+      $viewMode = 'pdf';
+    }
+
+    // @todo Is this (i.e. $element['#display_image_on']) really the way to get element configuration?
+    $showImageOn = array_filter((array) ($element['#display_image_on'] ?? NULL));
+    $includeImage = isset($showImageOn[$viewMode]);
+
+    $showGeoJsonOn = array_filter((array) ($element['#display_geojson_on'] ?? NULL));
+    $includeGeoJson = isset($showGeoJsonOn[$viewMode]);
+
+    if ($includeImage) {
+      $build['image'] = [
+        '#type' => 'html_tag',
+        '#tag' => 'img',
+        '#attributes' => [
+          'class' => ['handler-help-message'],
+          'id' => $imageId,
+          'src' => $value['image'],
+        ],
+        '#prefix' => '<div class="os2forms-webform-maps-image">',
+        '#suffix' => '</div>',
+      ];
+    }
+
+    if ($includeGeoJson) {
+      $build['geojson'] = [
+        '#markup' => $value['geojson'],
+        '#prefix' => '<div class="os2forms-webform-maps-geojson">',
+        '#suffix' => '</div>',
+      ];
+    }
+
+    return $build;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function formatTextItem(array $element, WebformSubmissionInterface $webform_submission, array $options = []) {
+    $value = $this->getMapValue($element, $webform_submission, $options);
+
+    return $value['geojson'];
+  }
+
+  /**
+   * Get structured map value.
+   *
+   * @return array{
+   *   image: string,
+   *     geojson: string
+   *   }
+   */
+  private function getMapValue(array $element, WebformSubmissionInterface $webform_submission, array $options = []): array {
+    $value = $this->getValue($element, $webform_submission, $options);
+
+    try {
+      $data = json_decode($value, associative: TRUE, flags: JSON_THROW_ON_ERROR);
+    }
+    catch (\JsonException) {
+      $data = [];
+    }
+
+    return $data + [
+      'image' => '',
+      'geojson' => 'null',
+    ];
+  }
+
 }
diff --git a/modules/os2forms_webform_maps/templates/webform-element-base-html--webform-map-field.html.twig b/modules/os2forms_webform_maps/templates/webform-element-base-html--webform-map-field.html.twig
deleted file mode 100644
index cd3a19bd..00000000
--- a/modules/os2forms_webform_maps/templates/webform-element-base-html--webform-map-field.html.twig
+++ /dev/null
@@ -1,18 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for a webform base element as html.
- *
- * Available variables:
- * - element: The element.
- * - title: The label for the element.
- * - value: The content for the element.
- * - item: The form item used to display the element.
- * - options Associative array of options for element.
- *   - multiline: Flag to determine if value spans multiple lines.
- *   - email: Flag to determine if element is for an email.
- */
-#}
-  {{ map_image }}
-  {{ item }}
-