diff --git a/geofield.apachesolr.inc b/geofield.apachesolr.inc
index e7173de..3a699bd 100644
--- a/geofield.apachesolr.inc
+++ b/geofield.apachesolr.inc
@@ -18,11 +18,10 @@ function geofield_apachesolr_field_mappings() {
 /**
  * Apachesolr indexing callback for geofield.
  *
- * It will index 3 fields on Solr.
+ * It will index 2 fields on Solr:
  *
  * 1- Multi-valued field with all geometry(ies) points - as expected.
- * 2- A single field with the first (or the unique) point.
- * 3- The centroid of the geometry(ies).
+ * 2- The centroid of the geometry(ies), or the unique point.
  *
  * The single-value field is meant to be used for stats or as a performance
  * improvement in simple queries.
@@ -50,40 +49,39 @@ function geofield_apachesolr_indexing_callback($entity, $field_name, $index_key,
       );
     }
 
-    // Store the first geometry in a singular Solr field.
+    // Store the centroid of multiple geometries or the unique point in a
+    // singular Solr field.
     if ($field_info['multiple'] && !empty($values[0])) {
-      $value = reset($values);
-      $singular_field_info = $field_info;
-      $singular_field_info['multiple'] = FALSE;
-      $single_key = apachesolr_index_key($singular_field_info);
-      $fields[] = array(
-        'key' => $single_key,
-        'value' => $value['lat'] . ',' . $value['lon'],
-      );
-    }
 
-    // Store the centroid of multiple geometries in a singular Solr field.
-    if ($field_info['multiple'] && !empty($values[0])) {
-      // Combine the geometries.
-      $geoms = array();
-      foreach ($values as $delta => $item) {
-        $items_wkt = 'POINT(' . $item['lon'] . ' ' . $item['lat'] . ')';
-        $geoms[] = geoPHP::load($items_wkt);
+      // If there are multiple values, then get the centroid.
+      if (count($values) > 1) {
+        // Combine the geometries.
+        $geoms = array();
+        foreach ($values as $delta => $item) {
+          $items_wkt = 'POINT(' . $item['lon'] . ' ' . $item['lat'] . ')';
+          $geoms[] = geoPHP::load($items_wkt);
+        }
+        $combined_geom = geoPHP::geometryReduce($geoms);
+        // Get the centroid.
+        $centroid = $combined_geom->getCentroid();
+        // Format the value to be indexed.
+        $formated_value = $centroid->y() . ',' . $centroid->x();
       }
-      $combined_geom = geoPHP::geometryReduce($geoms);
 
-      // Get the centroid.
-      $centroid = $combined_geom->getCentroid();
+      // There is no need for addition computation of a single point.
+      else {
+        $value = reset($values);
+        $formated_value = $value['lat'] . ',' . $value['lon'];
+      }
 
+      // Get the field info and make it singular.
       $singular_field_info = $field_info;
       $singular_field_info['multiple'] = FALSE;
-      // Prepend 'ctd_' to the centroid field.
-      $singular_field_info['name'] = 'ctd_' . $singular_field_info['name'];
 
       $single_key = apachesolr_index_key($singular_field_info);
       $fields[] = array(
         'key' => $single_key,
-        'value' => $centroid->y() . ',' . $centroid->x(),
+        'value' => $formated_value,
       );
     }
   }