diff --git a/src/RecordManager/Finna/Record/QdcRecordTrait.php b/src/RecordManager/Finna/Record/QdcRecordTrait.php
index c2df1653..fa738a94 100644
--- a/src/RecordManager/Finna/Record/QdcRecordTrait.php
+++ b/src/RecordManager/Finna/Record/QdcRecordTrait.php
@@ -137,26 +137,10 @@ public function toSolrArray(Database $db = null)
             }
         }
 
-        foreach ($this->doc->coverage as $coverage) {
-            $attrs = $coverage->attributes();
-            if ($attrs->type == 'geocoding') {
-                $match = preg_match(
-                    '/([\d\.]+)\s*,\s*([\d\.]+)/',
-                    trim((string)$coverage),
-                    $matches
-                );
-                if ($match) {
-                    if ($attrs->format == 'lon,lat') {
-                        $lon = $matches[1];
-                        $lat = $matches[2];
-                    } else {
-                        $lat = $matches[1];
-                        $lon = $matches[2];
-                    }
-                    $data['location_geo'][] = "POINT($lon $lat)";
-                }
-            }
-        }
+        $data['era'] = $data['era_facet'] = $this->getCoverageByType('temporal');
+        $data['geographic'] = $data['geographic_facet'] = $this->getCoverageByType('spatial');
+        $data['location_geo'] = $this->getCoverageByType('geocoding');
+
         if (!empty($data['location_geo'])) {
             $data['center_coords']
                 = $this->metadataUtils->getCenterCoordinates($data['location_geo']);
@@ -187,6 +171,67 @@ public function toSolrArray(Database $db = null)
         return $data;
     }
 
+    /**
+     * Get locations for geocoding
+     *
+     * Returns an associative array of primary and secondary locations
+     *
+     * @return array
+     */
+    public function getLocations(): array
+    {
+        $locations = [];
+        // If there is already coordinates in the record, don't return anything for geocoding
+        if (!$this->getCoverageByType('geocoding')) {
+            $locations = $this->getCoverageByType('spatial');
+        }
+        return [
+            'primary' => $locations,
+            'secondary' => [],
+        ];
+    }
+
+    /**
+     * Get coverage by type
+     *
+     * @param string $type Type attribute
+     *
+     * @return array
+     */
+    protected function getCoverageByType(string $type): array
+    {
+        $result = [];
+        foreach ($this->doc->coverage as $coverage) {
+            if ($type !== (string)$coverage->attributes()->type) {
+                continue;
+            }
+            $cov = trim((string)$coverage);
+            // Check if field contains coordinates
+            $match = preg_match(
+                '/([\d\.]+)\s*,\s*([\d\.]+)/',
+                $cov,
+                $matches
+            );
+            // If type is geocoding, return only coordinates.
+            // Other types might contain ill-formatted coordinates which should be discarded.
+            if ('geocoding' === $type) {
+                if ($match) {
+                    if ($coverage->attributes()->format == 'lon,lat') {
+                        $lon = $matches[1];
+                        $lat = $matches[2];
+                    } else {
+                        $lat = $matches[1];
+                        $lon = $matches[2];
+                    }
+                    $result[] = "POINT($lon $lat)";
+                }
+            } elseif (!$match && $stripped = $this->metadataUtils->stripTrailingPunctuation($cov, '.')) {
+                $result[] = $stripped;
+            }
+        }
+        return $result;
+    }
+
     /**
      * Check if the needle is found in the haystack using fnmatch for comparison
      *
diff --git a/tests/RecordManagerTest/Finna/Record/QdcTest.php b/tests/RecordManagerTest/Finna/Record/QdcTest.php
index 78950d14..42321de9 100644
--- a/tests/RecordManagerTest/Finna/Record/QdcTest.php
+++ b/tests/RecordManagerTest/Finna/Record/QdcTest.php
@@ -88,6 +88,42 @@ public function testDateRanges()
         $this->assertEquals($expected, $fields);
     }
 
+    /**
+     * Test coverage.
+     *
+     * @return void
+     */
+    public function testCoverage()
+    {
+        $spatial = [
+            'Helsinki',
+            'Vantaa',
+        ];
+        $temporal = [
+            '2010',
+            '2010-luku',
+        ];
+        $geocoding = [
+            'POINT(27.1826451 63.5694237)',
+            'POINT(20.0 60.0)',
+        ];
+        $fields = $this->createRecord(
+            Qdc::class,
+            'qdc_dateranges.xml',
+            [],
+            'Finna',
+            [
+                $this->createMock(\RecordManager\Base\Http\ClientManager::class),
+            ]
+        );
+        $fields = $fields->toSolrArray();
+        $this->assertEquals($spatial, $fields['geographic']);
+        $this->assertEquals($spatial, $fields['geographic_facet']);
+        $this->assertEquals($geocoding, $fields['location_geo']);
+        $this->assertEquals($temporal, $fields['era']);
+        $this->assertEquals($temporal, $fields['era_facet']);
+    }
+
     /**
      * Test media types
      *
diff --git a/tests/fixtures/Finna/record/qdc_dateranges.xml b/tests/fixtures/Finna/record/qdc_dateranges.xml
index d42b10fd..1a7299d0 100644
--- a/tests/fixtures/Finna/record/qdc_dateranges.xml
+++ b/tests/fixtures/Finna/record/qdc_dateranges.xml
@@ -53,4 +53,15 @@
     <date>20221212-20221214</date>
     <date>20221210</date>
     <date>2 028----00 05</date>
+
+    <!-- Dates and places in coverage -->
+    <coverage>Undefined coverage type</coverage>
+    <coverage type="temporal">2010</coverage>
+    <coverage type="temporal"> 2010-luku.</coverage>
+    <coverage type="spatial">Helsinki.</coverage>
+    <coverage type="spatial">Vantaa</coverage>
+    <coverage type="spatial">63.0,27.0</coverage>
+    <coverage type="geocoding" format="lat,lon">63.5694237,27.1826451</coverage>
+    <coverage type="geocoding" format="lon,lat">20.0,60.0</coverage>
+    <coverage type="geocoding" format="lat,lon">Iisalmi</coverage>
 </dc>