diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74c6241f5584d0820a329fcb3c6b216b2f53f6fd..efaabadccf89f72022cd31eb733a417579367c15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 * Output a data processor as a dashboard.
 * Output a data processor as a tab on the contact summary screen.
 * Added field outputs for simple calculations (substract and total).
+* Added escaped output to search screens.
+* Replaced the value separator in the raw field with a comma.
 
 # Version 1.0.7
 
diff --git a/Civi/DataProcessor/FieldOutputHandler/RawFieldOutputHandler.php b/Civi/DataProcessor/FieldOutputHandler/RawFieldOutputHandler.php
index 654b13c76ff9f273c26a53c975167f930cd38cb2..e7edd0c31f119bde01b44a6c5ce3edff8f893296 100644
--- a/Civi/DataProcessor/FieldOutputHandler/RawFieldOutputHandler.php
+++ b/Civi/DataProcessor/FieldOutputHandler/RawFieldOutputHandler.php
@@ -90,7 +90,14 @@ class RawFieldOutputHandler extends AbstractFieldOutputHandler implements Output
    * @return \Civi\DataProcessor\FieldOutputHandler\FieldOutput
    */
   public function formatField($rawRecord, $formattedRecord) {
-    return new FieldOutput($rawRecord[$this->inputFieldSpec->alias]);
+    $formattedValue = $rawRecord[$this->inputFieldSpec->alias];
+    if (strpos($formattedValue, \CRM_Core_DAO::VALUE_SEPARATOR) !== false) {
+      $formattedValue = explode(\CRM_Core_DAO::VALUE_SEPARATOR, substr($formattedValue, 1, -1));
+      $formattedValue = implode(",", $formattedValue);
+    }
+    $output = new FieldOutput($rawRecord[$this->inputFieldSpec->alias]);
+    $output->formattedValue = $formattedValue;
+    return $output;
   }
 
   /**
@@ -175,4 +182,4 @@ class RawFieldOutputHandler extends AbstractFieldOutputHandler implements Output
   }
 
 
-}
\ No newline at end of file
+}
diff --git a/templates/CRM/Contact/Form/DataProcessorContactSearch.tpl b/templates/CRM/Contact/Form/DataProcessorContactSearch.tpl
index 80374cebe569cca8f7d0cdfb54c5997f051c04d0..5d9e23d3dcce9c7342756f8998a0baae5ed1cca2 100644
--- a/templates/CRM/Contact/Form/DataProcessorContactSearch.tpl
+++ b/templates/CRM/Contact/Form/DataProcessorContactSearch.tpl
@@ -49,7 +49,7 @@
                             <td>{$row.contact_type}</td>
                             {foreach from=$columnHeaders key=headerName item=headerTitle}
                                 {assign var=columnValue value=$record.$headerName}
-                                <td>{$columnValue}</td>
+                                <td>{$columnValue|escape:'html'}</td>
                             {/foreach}
 
                             <td>
diff --git a/templates/CRM/DataprocessorSearch/Form/Search.tpl b/templates/CRM/DataprocessorSearch/Form/Search.tpl
index 283f3d66ecbaf9a8f6a95d1af50509dbd4731091..94fc89a816d965956a2fe7bff11ef47f2b47cbd1 100644
--- a/templates/CRM/DataprocessorSearch/Form/Search.tpl
+++ b/templates/CRM/DataprocessorSearch/Form/Search.tpl
@@ -52,7 +52,7 @@
                             {if $id_field}<td>{$form.$cbName.html}</td>{/if}
                             {foreach from=$columnHeaders key=headerName item=headerTitle}
                                 {assign var=columnValue value=$record.$headerName}
-                                <td>{$columnValue}</td>
+                                <td>{$columnValue|escape:'html'}</td>
                             {/foreach}
 
                             <td>