diff --git a/src/Submission.php b/src/Submission.php
index 03f4495..3536d57 100644
--- a/src/Submission.php
+++ b/src/Submission.php
@@ -99,8 +99,8 @@ class Submission {
         $message_manager = \Drupal::service('webform.message_manager');
         $message_manager->setWebformSubmission($result);
         $message_array = $message_manager->build(WebformMessageManagerInterface::SUBMISSION_CONFIRMATION_MESSAGE);
-        $message = trim(strip_tags(\Drupal::service('renderer')
-          ->render($message_array)));
+        $message = trim(\Drupal::service('renderer')
+          ->render($message_array));
         return [
           'saved' => TRUE,
           'userMessages' => [
diff --git a/src/Transformer.php b/src/Transformer.php
index 75e24cc..3436825 100644
--- a/src/Transformer.php
+++ b/src/Transformer.php
@@ -114,6 +114,13 @@ class Transformer {
       $properties = [
         'title' => (string) $item->elementPlugin->getLabel($item->element),
       ];
+
+      // Add description to properties of element if it exists.
+      if (!empty((string) $item->elementPlugin->getElementProperty($item->element, "description"))) {
+        $description = ['description' => (string) $item->elementPlugin->getElementProperty($item->element, "description"),];
+        $properties = array_merge($properties, $description);
+      }
+
       if ($item->element['#type'] === 'container') {
         $properties['title'] = '';
       }
@@ -153,6 +160,12 @@ class Transformer {
             $properties['pattern'] = $item->element['#pattern'];
           }
         }
+        elseif ($item->element['#type'] === 'webform_decoupled_file') {
+          $properties['type'] = 'string';
+          // Using format to comply with jsonschema standard.
+          // For this type of field format shouldn't be used in form.
+          $properties['format'] = 'decoupled-file';
+        }
         elseif ($item->element['#type'] === 'hidden') {
           $properties['type'] = 'string';
         }