diff --git a/config/schema/simple_gmap.schema.yml b/config/schema/simple_gmap.schema.yml
new file mode 100644
index 0000000..4b2b8fc
--- /dev/null
+++ b/config/schema/simple_gmap.schema.yml
@@ -0,0 +1,37 @@
+field.formatter.settings.simple_gmap:
+  type: mapping
+  label: 'Link format settings'
+  mapping:
+    include_map:
+      type: boolean
+      label: 'Whether to include a dynamic map'
+    include_static_map:
+      type: boolean
+      label: 'Whether to include a static map'
+    include_link:
+      type: boolean
+      label: 'Whether to include a link to the Google Map'
+    include_text:
+      type: boolean
+      label: 'Whether to include a text with the map'
+    iframe_height:
+      type: integer
+      label: 'Height of embedded map'
+    iframe_width:
+      type: integer
+      label: 'Width of embedded map'
+    zoom_level:
+      type: integer
+      label: 'Height of embedded map'
+    information_bubble:
+      type: boolean
+      label: 'Whether to include an information bubble'
+    link_text:
+      type: string
+      label: 'The text for the link to the Google Map'
+    map_type:
+      type: string
+      label: 'The default type of map to be displayed'
+    langcode:
+      type: string
+      label: 'The language, in which the map should be displayed'
\ No newline at end of file
diff --git a/src/Plugin/Field/FieldFormatter/SimpleGMapFormatter.php b/src/Plugin/Field/FieldFormatter/SimpleGMapFormatter.php
index 8a88263..fb643aa 100644
--- a/src/Plugin/Field/FieldFormatter/SimpleGMapFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/SimpleGMapFormatter.php
@@ -5,6 +5,7 @@ namespace Drupal\simple_gmap\Plugin\Field\FieldFormatter;
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\FormatterBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Component\Utility\SafeMarkup;
 
 /**
  * Plugin implementation of the 'simple_gmap' formatter.
@@ -239,7 +240,7 @@ class SimpleGMapFormatter extends FormatterBase {
     foreach ($items as $delta => $item) {
       $url_value = urlencode($item->value);
       $address_value = $item->value;
-      $address = $text ? $address_value : '';
+      $address = $text ? SafeMarkup::checkPlain($address_value) : '';
       $text_for_link = ($settings['link_text'] == 'use_address') ? $address_value : $settings['link_text'];
       $link_text = ['#plain_text' => $text_for_link];