diff --git a/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsDefaultFormatter.php b/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsDefaultFormatter.php
index 0b61f44..54f5d9e 100644
--- a/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsDefaultFormatter.php
+++ b/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsDefaultFormatter.php
@@ -49,8 +49,10 @@ public function viewElements(FieldItemListInterface $items) {
         // If the stored value is in the current set of allowed values, display
         // the associated label, otherwise just display the raw value.
         $output = isset($options[$value]) ? $options[$value] : $value;
-        // @todo convert to markup using the tag list.
-        $elements[$delta] = array('#markup' => FieldFilteredString::create($output));
+        $elements[$delta] = array(
+          '#markup' => $output,
+          '#allowed_tags' => FieldFilteredString::allowedTags(),
+        );
       }
     }
 
diff --git a/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsKeyFormatter.php b/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsKeyFormatter.php
index 579c1e6..69776f8 100644
--- a/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsKeyFormatter.php
+++ b/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsKeyFormatter.php
@@ -36,8 +36,10 @@ public function viewElements(FieldItemListInterface $items) {
     $elements = array();
 
     foreach ($items as $delta => $item) {
-      // @todo convert to markup using the tag list.
-      $elements[$delta] = array('#markup' => FieldFilteredString::create($item->value));
+      $elements[$delta] = array(
+        '#markup' => $item->value,
+        '#allowed_tags' => FieldFilteredString::allowedTags(),
+      );
     }
 
     return $elements;