diff --git a/includes/service.inc b/includes/service.inc
index 043f5b7..56a4070 100644
--- a/includes/service.inc
+++ b/includes/service.inc
@@ -207,9 +207,22 @@ class SearchApiSolrService extends SearchApiAbstractService {
     $form['advanced']['highlight_data'] = array(
       '#type' => 'checkbox',
       '#title' => t('Highlight retrieved data'),
-      '#description' => t('When retrieving result data from the Solr server, try to highlight the search terms in the returned fulltext fields.'),
+      '#description' => t('When retrieving result data from the Solr server, try to highlight the search terms in the returned fields.'),
       '#default_value' => $options['highlight_data'],
     );
+    $form['advanced']['highlight_prefixes'] = array(
+      '#type' => 'textarea',
+      '#title' => t('Field prefixes to highlight'),
+      '#description' => t('Highlight the search terms with the given prefix.'),
+      '#default_value' => $options['highlight_prefixes'] ? $options['highlight_prefixes'] : 'tm_',
+      '#states' => array(
+        'visible' => array(
+          'input[name="options[form][advanced][highlight_data]"]' => array(
+            'checked' => TRUE,
+          ),
+        ),
+      ),
+    );
     $form['advanced']['skip_schema_check'] = array(
       '#type' => 'checkbox',
       '#title' => t('Skip schema verification'),
@@ -1349,7 +1362,7 @@ class SearchApiSolrService extends SearchApiAbstractService {
     }
     if (!empty($this->options['highlight_data'])) {
       foreach ($field_mapping as $search_api_property => $solr_property) {
-        if (substr($solr_property, 0, 3) == 'tm_' && !empty($response->highlighting->$id->$solr_property)) {
+        if (substr($solr_property, 0, 3) == $this->options['highlight_prefix'] && !empty($response->highlighting->$id->$solr_property)) {
           // Contrary to above, we here want to preserve HTML, so we just
           // replace the [HIGHLIGHT] tags with the appropriate format.
           $fields[$search_api_property] = $this->formatHighlighting($response->highlighting->$id->$solr_property);
@@ -1728,7 +1741,7 @@ class SearchApiSolrService extends SearchApiAbstractService {
     }
 
     if (!empty($this->options['highlight_data'])) {
-      $highlight_params['hl.fl'] = 'tm_*';
+      $highlight_params['hl.fl'] = $this->options['highlight_prefix'] . '*';
       $highlight_params['hl.snippets'] = 1;
       $highlight_params['hl.fragsize'] = 0;
       if (!empty($this->options['excerpt'])) {