diff --git a/code/search/ContentControllerSearchExtension.php b/code/search/ContentControllerSearchExtension.php
index 01d6e52f..527d133a 100644
--- a/code/search/ContentControllerSearchExtension.php
+++ b/code/search/ContentControllerSearchExtension.php
@@ -42,7 +42,7 @@ class ContentControllerSearchExtension extends Extension {
 	public function results($data, $form, $request) {
 		$data = array(
 			'Results' => $form->getResults(),
-			'Query' => $form->getSearchQuery(),
+			'Query' => DBField::create_field('Text', $form->getSearchQuery()),
 			'Title' => _t('SearchForm.SearchResults', 'Search Results')
 		);
 		return $this->owner->customise($data)->renderWith(array('Page_results', 'Page'));
diff --git a/code/search/SearchForm.php b/code/search/SearchForm.php
index 8ee7b105..cbafee55 100644
--- a/code/search/SearchForm.php
+++ b/code/search/SearchForm.php
@@ -27,6 +27,10 @@ class SearchForm extends Form {
 		"SiteTree", "File"
 	);
 	
+	private static $casting = array(
+		'SearchQuery' => 'Text'
+	);
+	
 	/**
 	 * 
 	 * @param Controller $controller
@@ -186,7 +190,7 @@ class SearchForm extends Form {
 		if(!isset($data)) $data = $_REQUEST;
 		
 		// The form could be rendered without the search being done, so check for that.
-		if (isset($data['Search'])) return Convert::raw2xml($data['Search']);
+		if (isset($data['Search'])) return $data['Search'];
 	}
 	
 	/**